7 files changed, 34 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
index 61c5ab01dd..f493ae121d 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
@@ -122,6 +122,7 @@ Import-Package: javax.servlet,
  org.apache.tuscany.sca.policy.security;version="2.0.0",
  org.apache.tuscany.sca.policy.security.http.ssl;version="2.0.0",
  org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.policy.wspolicy;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.apache.tuscany.sca.xsd;version="2.0.0",
diff --git a/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF
index baae06d53a..a8e20c2d47 100644
--- a/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF
@@ -33,6 +33,9 @@ Bundle-Description: Apache Tuscany SCA Core SPI
 Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",
  org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.definitions;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0",
diff --git a/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF
index 203d2b3073..964e629744 100644
--- a/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF
@@ -40,6 +40,7 @@ Import-Package: javax.security.auth,
  javax.xml.namespace,
  javax.xml.stream,
  javax.xml.transform,
+ javax.xml.ws,
  net.sf.cglib.proxy;resolution:=optional,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
index a2e407b300..a8339b70b3 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Import-Package: javax.wsdl,
  javax.wsdl.factory,
  javax.wsdl.xml,
  javax.xml.stream,
+ javax.xml.namespace,
  com.hazelcast.client,
  com.hazelcast.config,
  com.hazelcast.core,
@@ -39,6 +40,7 @@ Import-Package: javax.wsdl,
  org.oasisopen.sca.annotation,
  org.w3c.dom,
  org.xml.sax
-Export-Package: org.apache.tuscany.sca.registry.hazelcast;version="2.0.0";
- uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
+Export-Package: org.apache.tuscany.sca.binding.hazelcast;version="2.0.0",
+ org.apache.tuscany.sca.registry.hazelcast;version="2.0.0";
+   uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
 
diff --git a/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF
index e3ce23a3d9..701573fc4f 100644
--- a/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF
@@ -8,14 +8,32 @@ Bundle-Version: 2.0.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Domain Node
-Import-Package: 
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.common.java.io;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.deployment;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.management;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.node;version="2.0.0",
  org.apache.tuscany.sca.node.configuration;version="2.0.0",
  org.apache.tuscany.sca.node.impl;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
- org.apache.tuscany.sca.context;version="2.0.0",
- org.apache.tuscany.sca.work;version="2.0.0"
+ org.apache.tuscany.sca.work;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
+ javax.xml.stream
 Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
index 7d0d0b62a1..bac36531a2 100644
--- a/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.policy.xml;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.wspolicy
 Bundle-DocURL: http://www.apache.org/
-Export-Package: org.apache.tuscany.sca.policy.wspolicy.xml;version="2.0.0";
+Export-Package: org.apache.tuscany.sca.policy.wspolicy;version="2.0.0",
+  org.apache.tuscany.sca.policy.wspolicy.xml;version="2.0.0";
   uses:="javax.xml.stream,
    junit.framework,
    org.apache.tuscany.sca.contribution.resolver,
diff --git a/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
index 11092b9b34..37668a669d 100644
--- a/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Vendor: The Apache Software Foundation
 Bundle-Version: 2.0.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Domain Node
+Bundle-Description: Apache Tuscany SCA Shell
 Import-Package: 
  org.apache.tuscany.sca;version="2.0.0",
  org.apache.tuscany.sca.context;version="2.0.0",
@@ -17,6 +17,6 @@ Import-Package:
  org.apache.tuscany.sca.node.impl;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.apache.tuscany.sca.work;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
+Bundle-SymbolicName: org.apache.tuscany.sca.shell
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6