30 files changed, 157 insertions, 171 deletions
diff --git a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
index aa51451f75..baf7af6439 100644
--- a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
@@ -1,27 +1,34 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.assembly.xml;version="2.0.0";
-  uses:="org.apache.tuscany.sca.definitions,
-   javax.xml.transform.dom,
+  uses:="org.apache.tuscany.sca.assembly,
+   javax.xml.parsers,
    org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.contribution,
+   org.apache.tuscany.sca.monitor,
    org.apache.tuscany.sca.policy,
+   org.apache.tuscany.sca.interfacedef,
+   org.w3c.dom,
    javax.xml.namespace,
-   org.apache.tuscany.sca.contribution.java,
    javax.xml.stream,
    org.apache.tuscany.sca.contribution.resolver,
-   org.apache.tuscany.sca.policy.util,
-   org.apache.tuscany.sca.assembly,
-   javax.xml.parsers,
-   org.apache.tuscany.sca.contribution,
+   org.apache.tuscany.sca.contribution.processor",
+ org.apache.tuscany.sca.definitions.xml;version="2.0.0";
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.definitions,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
    org.apache.tuscany.sca.monitor,
-   org.w3c.dom,
-   org.apache.tuscany.sca.interfacedef,
-   org.apache.tuscany.sca.contribution.namespace,
-   javax.xml.xpath,
-   javax.xml.transform,
+   javax.xml.namespace",
+ org.apache.tuscany.sca.policy.xml;version="2.0.0";
+  uses:="javax.xml.xpath,
+   javax.xml.stream,
+   org.apache.tuscany.sca.contribution.resolver,
    org.apache.tuscany.sca.contribution.processor,
-   org.apache.tuscany.sca.interfacedef.impl",
- org.apache.tuscany.sca.definitions.xml;version="2.0.0",
- org.apache.tuscany.sca.policy.xml;version="2.0.0"
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.policy,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA XML Assembly Model
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -34,12 +41,10 @@ Bundle-Description: Apache Tuscany SCA XML Assembly Model
 Import-Package: javax.xml.namespace,
  javax.xml.parsers,
  javax.xml.stream,
- javax.xml.transform,
  javax.xml.transform.dom,
  javax.xml.validation;resolution:=optional,
  javax.xml.xpath,
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.common.java.io;version="2.0.0",
  org.apache.tuscany.sca.common.xml.xpath;version="2.0.0",
diff --git a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
index cabc686fcf..05f5c8471e 100644
--- a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Bundle-DocURL: http://www.apache.org/
 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
 Export-Package: org.apache.tuscany.sca.assembly.xsd;version="2.0.0"
+Import-Package: javax.xml.namespace
diff --git a/java/sca/modules/assembly/META-INF/MANIFEST.MF b/java/sca/modules/assembly/META-INF/MANIFEST.MF
index 3ecfceaa4d..a6327b2c98 100644
--- a/java/sca/modules/assembly/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.assembly;version="2.0.0";
   uses:="javax.xml.xpath,
    org.apache.tuscany.sca.assembly.impl,
+   org.apache.tuscany.sca.core,
    org.apache.tuscany.sca.policy,
    org.apache.tuscany.sca.interfacedef,
    javax.xml.namespace",
@@ -13,43 +14,18 @@ Export-Package: org.apache.tuscany.sca.assembly;version="2.0.0";
  org.apache.tuscany.sca.assembly.impl;version="2.0.0";
   uses:="javax.xml.xpath,
    org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.core,
    org.apache.tuscany.sca.policy,
    org.apache.tuscany.sca.interfacedef,
    javax.xml.namespace",
- org.apache.tuscany.sca.policy.util;version="2.0.0";
-  uses:="javax.xml.parsers,
-   javax.xml.transform.dom,
-   org.apache.tuscany.sca.policy,
-   org.apache.tuscany.sca.extensibility,
-   org.w3c.dom,javax.xml.namespace,
-   javax.xml.xpath,javax.xml.transform,
-   javax.xml.transform.stream",
- org.apache.tuscany.sca.policy.impl;version="2.0.0";
-  uses:="javax.xml.xpath,
-   org.apache.tuscany.sca.policy,
-   javax.xml.namespace",
- org.apache.tuscany.sca.policy;version="2.0.0";
-  uses:="javax.xml.xpath,
-   org.apache.tuscany.sca.policy.impl,
-   javax.xml.namespace",
- org.apache.tuscany.sca.interfacedef.util;version="2.0.0";
-  uses:="javax.xml.transform,
-  org.apache.tuscany.sca.interfacedef.impl,
-  org.apache.tuscany.sca.interfacedef,
-  javax.xml.datatype,
-  javax.xml.namespace",
- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";
-  uses:="org.apache.tuscany.sca.interfacedef.util,
-  org.apache.tuscany.sca.policy,
-  org.apache.tuscany.sca.interfacedef",
- org.apache.tuscany.sca.interfacedef;version="2.0.0";
- uses:="org.apache.tuscany.sca.interfacedef.util,
-  org.apache.tuscany.sca.policy",
- org.apache.tuscany.sca.definitions;version="2.0.0";
-  uses:="org.apache.tuscany.sca.policy,
-   javax.xml.namespace",     
- org.apache.tuscany.sca.definitions.util;version="2.0.0";
-  uses:="org.apache.tuscany.sca.definitions"
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.definitions.util;version="2.0.0";uses:="org.apache.tuscany.sca.definitions,org.apache.tuscany.sca.monitor",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0";uses:="org.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.sca.policy",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";uses:="org.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0";uses:="org.apache.tuscany.sca.interfacedef,javax.xml.namespace",
+ org.apache.tuscany.sca.policy;version="2.0.0";uses:="javax.xml.xpath,org.apache.tuscany.sca.policy.impl,javax.xml.namespace",
+ org.apache.tuscany.sca.policy.impl;version="2.0.0";uses:="javax.xml.xpath,org.apache.tuscany.sca.policy,javax.xml.namespace",
+ org.apache.tuscany.sca.policy.util;version="2.0.0";uses:="javax.xml.parsers,org.apache.tuscany.sca.policy"
 Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=
  "2.0.0"
 Tool: Bnd-0.0.255
@@ -66,7 +42,6 @@ Import-Package: javax.xml.datatype,
  javax.xml.parsers,
  javax.xml.transform,
  javax.xml.transform.dom,
- javax.xml.transform.sax,
  javax.xml.transform.stream,
  javax.xml.xpath,
  org.apache.tuscany.sca.assembly;version="2.0.0",
@@ -81,8 +56,7 @@ Import-Package: javax.xml.datatype,
  org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.policy.impl;version="2.0.0",
  org.apache.tuscany.sca.policy.util;version="2.0.0",
- org.w3c.dom,
- org.xml.sax
+ org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.assembly
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 64df1fd696..b29dc9bc59 100644
--- a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
@@ -12,18 +12,12 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA HTTP Binding Runtime
 Import-Package: javax.servlet,
  javax.servlet.http,
- javax.xml.namespace,
- javax.xml.stream,
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.http;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.host.http;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.invocation;version="2.0.0",
- org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.oasisopen.sca.annotation;version="2.0.0"
diff --git a/java/sca/modules/binding-http/META-INF/MANIFEST.MF b/java/sca/modules/binding-http/META-INF/MANIFEST.MF
index d50454f842..5336512666 100644
--- a/java/sca/modules/binding-http/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-http/META-INF/MANIFEST.MF
@@ -1,11 +1,6 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.http;uses:="org.apache.
- tuscany.sca.assembly,javax.xml.namespace,javax.servlet.http";version=
- "2.0.0"
-Private-Package: org.apache.tuscany.sca.binding.http.xml;version="2.0.
- 0",.;version="2.0.0",org.apache.tuscany.sca.binding.http.impl;version
- ="2.0.0"
-Tool: Bnd-0.0.311
+Export-Package: org.apache.tuscany.sca.binding.http;version="2.0.0";
+ uses:="org.apache.tuscany.sca.assembly,javax.xml.namespace,javax.servlet.http"
 Bundle-Name: Apache Tuscany SCA HTTP Binding Model
 Created-By: 1.6.0_15 (Apple Inc.)
 Bundle-Vendor: The Apache Software Foundation
@@ -18,7 +13,6 @@ Import-Package: javax.servlet.http,
  javax.xml.namespace,
  javax.xml.stream,
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.http;version="2.0.0",
  org.apache.tuscany.sca.contribution.processor;version="2.0.0",
  org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
diff --git a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index b0c597c6e6..fd69b62555 100644
--- a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
@@ -10,10 +10,8 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JMS Binding Runtime
 Import-Package: javax.jms,
  org.apache.axiom.om,
- org.apache.axiom.om.impl,
  org.apache.axiom.om.impl.builder,
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.jms;version="2.0.0",
  org.apache.tuscany.sca.binding.jms.operationselector;version="2.0.0",
  org.apache.tuscany.sca.binding.jms.policy.authentication.token;version="2.0.0",
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
index ceb8cdfd67..d4773c52e4 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
+++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
@@ -17,11 +17,12 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.jms.policy.authentication.token;
+package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider;
 
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.provider.PolicyProviderFactory;
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
index 99b3355840..a67c7723e3 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
+++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.policy.authentication.token;
+package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider;
 
 
 import javax.jms.JMSException;
 import javax.security.auth.Subject;
 
 import org.apache.tuscany.sca.binding.jms.JMSBindingException;
+import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
index 9515f7242c..e630d0cd53 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
+++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
@@ -17,11 +17,12 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.jms.policy.authentication.token;
+package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider;
 
 import java.util.List;
 
 import org.apache.tuscany.sca.assembly.EndpointReference;
+import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Phase;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
index cedf29ec6f..60d0abe6be 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
+++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.policy.authentication.token;
+package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider;
 
 
 
@@ -25,6 +25,7 @@ import javax.security.auth.Subject;
 
 import org.apache.tuscany.sca.binding.jms.JMSBindingException;
 import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
+import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
index c37ae03c79..be5ca5dd61 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
+++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
@@ -17,11 +17,12 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.jms.policy.authentication.token;
+package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider;
 
 import java.util.List;
 
 import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Phase;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
diff --git a/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index b04c71d8e3..3b81a75d11 100644
--- a/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/java/sca/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the policy extension
-org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy
-\ No newline at end of file
+org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider.JMSTokenAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy
+\ No newline at end of file
diff --git a/java/sca/modules/binding-jms/META-INF/MANIFEST.MF b/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
index 3e277c50fd..54451c4d08 100644
--- a/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
@@ -1,11 +1,44 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.jms;version="2.0.0";
-  uses:="org.apache.tuscany.sca.assembly",
- org.apache.tuscany.sca.binding.jms.operationselector;version="2.0.0",
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.policy,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace",
+ org.apache.tuscany.sca.binding.jms.operationselector;version="2.0.0";
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace",
  org.apache.tuscany.sca.binding.jms.policy;version="2.0.0",
- org.apache.tuscany.sca.binding.jms.policy.authentication.token;version="2.0.0",
- org.apache.tuscany.sca.binding.jms.policy.header;version="2.0.0",
- org.apache.tuscany.sca.binding.jms.wireformat;version="2.0.0"
+ org.apache.tuscany.sca.binding.jms.policy.authentication.token;version="2.0.0";
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace",
+ org.apache.tuscany.sca.binding.jms.policy.header;version="2.0.0";
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace",
+ org.apache.tuscany.sca.binding.jms.wireformat;version="2.0.0";
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.monitor,
+   javax.xml.namespace"
 Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA JMS Binding Model
diff --git a/java/sca/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
index 0d67f1d87d..4ff2e71eea 100644
--- a/java/sca/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
@@ -13,20 +13,18 @@ Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.net;version="1.3.0",
- org.apache.http;version="4.0.0.beta1",
+ org.apache.http;version="4.0.1",
  org.apache.http.client;version="4.0.0",
  org.apache.http.client.methods;version="4.0.0",
  org.apache.http.client.utils;version="4.0.0",
  org.apache.http.conn;version="4.0.0",
  org.apache.http.impl.client;version="4.0.0",
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.binding.jsonp;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.host.http;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.invocation;version="2.0.0",
- org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.codehaus.jackson;version="1.0.1",
diff --git a/java/sca/modules/binding-jsonp/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonp/META-INF/MANIFEST.MF
index df81ff7ff6..2a000f4e0a 100644
--- a/java/sca/modules/binding-jsonp/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonp/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.jsonp;version="2.0.0";uses:="org.apache.tuscany.sca.assembly"
+Export-Package: org.apache.tuscany.sca.binding.jsonp;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,javax.xml.namespace"
 Private-Package: org.apache.tuscany.sca.binding.jsonp.impl;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA JSONP Binding Model
@@ -11,7 +11,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JSONP Binding Model
 Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.jsonp;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonp
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index ccf4d374a5..b391a310dd 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
@@ -9,19 +9,14 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime
 Import-Package: com.metaparadigm.jsonrpc;version="1.0.0",
+ javax.security.auth.login,
  javax.servlet,
  javax.servlet.http,
- javax.xml.namespace,
- javax.xml.stream;version="1.0",
- org.apache.commons.codec;version="1.3.0",
  org.apache.commons.httpclient;version="3.1.0",
  org.apache.commons.httpclient.methods,
  org.apache.commons.httpclient.params;version="3.1.0",
  org.apache.tuscany.sca.assembly;version="2.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.jsonrpc;version="2.0.0",
- org.apache.tuscany.sca.contribution.processor;version="2.0",
- org.apache.tuscany.sca.contribution.resolver;version="2.0",
  org.apache.tuscany.sca.core;version="2.0",
  org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
  org.apache.tuscany.sca.databinding.json,
@@ -29,7 +24,6 @@ Import-Package: com.metaparadigm.jsonrpc;version="1.0.0",
  org.apache.tuscany.sca.interfacedef,
  org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
  org.apache.tuscany.sca.invocation,
- org.apache.tuscany.sca.monitor;version="2.0",
  org.apache.tuscany.sca.node;version="2.0.0",
  org.apache.tuscany.sca.provider,
  org.apache.tuscany.sca.runtime,
diff --git a/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index e87848a52a..f7714ece88 100644
--- a/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
@@ -1,8 +1,5 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.jsonrpc;uses:="org.apac
- he.tuscany.sca.assembly,javax.xml.namespace";version="2.0.0",org.apache.tu
- scany.sca.binding.jsonrpc.impl;uses:="org.apache.tuscany.sca.binding.
- jsonrpc,javax.xml.namespace";version="2.0.0"
+Export-Package: org.apache.tuscany.sca.binding.jsonrpc;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,javax.xml.namespace"
 Tool: Bnd-0.0.357
 Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Model
 Created-By: 1.6.0_15 (Apple Inc.)
@@ -12,10 +9,10 @@ Bnd-LastModified: 1253941204236
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Model
-Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
- rsion="2.0",org.apache.tuscany.sca.assembly.xml;version="2.0.0",org.apa
- che.tuscany.sca.binding.jsonrpc;version="2.0.0",org.apache.t
- uscany.sca.binding.jsonrpc.impl;version="2.0.0"
+Import-Package: javax.xml.namespace,
+ org.apache.tuscany.sca.assembly;version="2.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.jsonrpc;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
index fa732649f8..fe6b9f83f1 100644
--- a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.rmi;uses:="org.apache.t
- uscany.sca.assembly";version="2.0.0"
+Export-Package: org.apache.tuscany.sca.binding.rmi;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,javax.xml.namespace"
 Private-Package: org.apache.tuscany.sca.binding.rmi.impl;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA RMI Binding Model
@@ -12,7 +11,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA RMI Binding Model
 Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.rmi;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/builder/META-INF/MANIFEST.MF b/java/sca/modules/builder/META-INF/MANIFEST.MF
index 77a8ebf812..df432f10c2 100644
--- a/java/sca/modules/builder/META-INF/MANIFEST.MF
+++ b/java/sca/modules/builder/META-INF/MANIFEST.MF
@@ -8,12 +8,15 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Assembly Model
 Import-Package: javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
  javax.xml.xpath,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",
  org.apache.tuscany.sca.common.xml.dom;version="2.0.0",
  org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
- org.apache.tuscany.sca.common.xml.xpath;version="2.0.0",
  org.apache.tuscany.sca.contribution.processor;version="2.0.0",
  org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.core;version="2.0.0",
diff --git a/java/sca/modules/common-java/META-INF/MANIFEST.MF b/java/sca/modules/common-java/META-INF/MANIFEST.MF
index 9b86dddeae..1795f1eacf 100644
--- a/java/sca/modules/common-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/common-java/META-INF/MANIFEST.MF
@@ -13,14 +13,12 @@ Import-Package: org.apache.tuscany.sca.common.java.classloader;version="2.0.0",
  org.apache.tuscany.sca.common.java.io;version="2.0.0",
  org.apache.tuscany.sca.common.java.reflection;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.extensibility;version="2.0.0",
- org.oasisopen.sca;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.common.java
 Bundle-DocURL: http://www.apache.org/
 Export-Package: org.apache.tuscany.sca.common.java.classloader;version="2.0.0",
  org.apache.tuscany.sca.common.java.collection;version="2.0.0",
  org.apache.tuscany.sca.common.java.io;version="2.0.0",
- org.apache.tuscany.sca.common.java.reflection;version="2.0.0"
+ org.apache.tuscany.sca.common.java.reflection;version="2.0.0";uses:="org.apache.tuscany.sca.core"
 
 
diff --git a/java/sca/modules/common-xml/META-INF/MANIFEST.MF b/java/sca/modules/common-xml/META-INF/MANIFEST.MF
index 7db6ea8e3b..1a40ccd3b9 100644
--- a/java/sca/modules/common-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/common-xml/META-INF/MANIFEST.MF
@@ -25,17 +25,34 @@ Import-Package: javax.xml.datatype,
  org.apache.tuscany.sca.common.xml.stax.reader;version="2.0.0",
  org.apache.tuscany.sca.common.xml.xpath;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.w3c.dom,
  org.xml.sax,
  org.xml.sax.ext,
  org.xml.sax.helpers
 Bundle-SymbolicName: org.apache.tuscany.sca.common.xml
 Bundle-DocURL: http://www.apache.org/
-Export-Package: org.apache.tuscany.sca.common.xml;version="2.0.0",
- org.apache.tuscany.sca.common.xml.dom;version="2.0.0",
- org.apache.tuscany.sca.common.xml.sax;version="2.0.0",
- org.apache.tuscany.sca.common.xml.xpath;version="2.0.0",
- org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
- org.apache.tuscany.sca.common.xml.stax.reader;version="2.0.0"
+Export-Package: org.apache.tuscany.sca.common.xml;version="2.0.0";uses:="org.xml.sax",
+ org.apache.tuscany.sca.common.xml.dom;version="2.0.0";
+  uses:="org.xml.sax.ext,
+   javax.xml.transform,
+   javax.xml.parsers,
+   org.apache.tuscany.sca.core,
+   org.w3c.dom,
+   javax.xml.namespace,
+   org.xml.sax",
+ org.apache.tuscany.sca.common.xml.sax;version="2.0.0";uses:="javax.xml.parsers,org.apache.tuscany.sca.core,org.xml.sax",
+ org.apache.tuscany.sca.common.xml.stax;version="2.0.0";
+  uses:="org.apache.tuscany.sca.common.xml.dom,
+   javax.xml.stream,
+   javax.xml.transform,
+   org.apache.tuscany.sca.core,
+   org.w3c.dom,
+   javax.xml.namespace,
+   org.xml.sax",
+ org.apache.tuscany.sca.common.xml.stax.reader;version="2.0.0";
+  uses:="javax.xml.stream,
+   javax.xml.stream.util,
+   org.w3c.dom,
+   javax.xml.namespace",
+ org.apache.tuscany.sca.common.xml.xpath;version="2.0.0";uses:="javax.xml.xpath,org.apache.tuscany.sca.core,javax.xml.namespace"
 
diff --git a/java/sca/modules/contribution/META-INF/MANIFEST.MF b/java/sca/modules/contribution/META-INF/MANIFEST.MF
index 939a445d13..a32ad146da 100644
--- a/java/sca/modules/contribution/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution/META-INF/MANIFEST.MF
@@ -33,6 +33,7 @@ Import-Package: javax.xml.namespace,
  javax.xml.stream.events,
  javax.xml.stream.util,
  javax.xml.transform,
+ javax.xml.transform.sax,
  javax.xml.transform.stream,
  javax.xml.validation,
  org.apache.tuscany.sca.assembly;version="2.0.0",
diff --git a/java/sca/modules/core/META-INF/MANIFEST.MF b/java/sca/modules/core/META-INF/MANIFEST.MF
index a9e28df9af..98800de77d 100644
--- a/java/sca/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core/META-INF/MANIFEST.MF
@@ -1,35 +1,23 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0";
-  uses:="org.apache.tuscany.sca.runtime,
-   org.apache.tuscany.sca.assembly,
-   org.apache.tuscany.sca.core.context,
-   org.apache.tuscany.sca.core.invocation,
-   org.apache.tuscany.sca.core.conversation,
-   org.apache.tuscany.sca.interfacedef.java",
+Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core",
  org.apache.tuscany.sca.core.context;version="2.0.0";
-  uses:="org.apache.tuscany.sca.runtime,
+  uses:="javax.xml.stream,
+   org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
    org.apache.tuscany.sca.context,
-   org.apache.tuscany.sca.core,
-   org.apache.tuscany.sca.core.conversation,
-   org.apache.tuscany.sca.interfacedef.java,
-   org.apache.tuscany.sca.interfacedef,
-   javax.xml.stream,
-   org.apache.tuscany.sca.core.assembly,
    org.oasisopen.sca,
-   org.apache.tuscany.sca.core.invocation",
+   org.apache.tuscany.sca.core",
  org.apache.tuscany.sca.core.factory;version="2.0.0",
  org.apache.tuscany.sca.core.invocation;version="2.0.0";
-  uses:="org.apache.tuscany.sca.runtime,
+  uses:="org.apache.tuscany.sca.invocation,
+   org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
-   org.apache.tuscany.sca.core,
-   org.apache.tuscany.sca.core.conversation,
-   org.apache.tuscany.sca.interfacedef,
-   org.apache.tuscany.sca.invocation,
-   org.apache.tuscany.sca.core.invocation.impl,
+   org.oasisopen.sca,
    org.apache.tuscany.sca.work,
    org.apache.tuscany.sca.core.factory,
-   org.oasisopen.sca",
+   org.apache.tuscany.sca.core.context.impl,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.interfacedef",
  org.apache.tuscany.sca.core.scope;version="2.0.0";
   uses:="org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.provider,
@@ -44,8 +32,7 @@ Bnd-LastModified: 1225397162265
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Core Runtime
-Import-Package: javax.naming,
- javax.security.auth,
+Import-Package: javax.security.auth,
  javax.xml.namespace,
  javax.xml.stream,
  net.sf.cglib.proxy;resolution:=optional,
@@ -62,7 +49,6 @@ Import-Package: javax.naming,
  org.apache.tuscany.sca.core.factory;version="2.0.0",
  org.apache.tuscany.sca.core.invocation;version="2.0.0",
  org.apache.tuscany.sca.core.scope;version="2.0.0",
- org.apache.tuscany.sca.core.wire;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
diff --git a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
index 7ce41329db..b8c7326487 100644
--- a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
@@ -12,13 +12,15 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Data Binding for JSON
 Import-Package: com.metaparadigm.jsonrpc,
  javax.xml.namespace,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.databinding;version="2.0.0",
  org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
  org.codehaus.jettison.badgerfish,
  org.codehaus.jettison.json,
@@ -27,6 +29,4 @@ Import-Package: com.metaparadigm.jsonrpc,
  org.oasisopen.sca.annotation;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json
 Bundle-DocURL: http://www.apache.org/
-Require-Bundle: org.apache.tuscany.sca.databinding,
- org.apache.tuscany.sca.assembly
 
diff --git a/java/sca/modules/extensibility/META-INF/MANIFEST.MF b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
index 24949ed812..d7729b7ce5 100644
--- a/java/sca/modules/extensibility/META-INF/MANIFEST.MF
+++ b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Tuscany-Comment1: Export the META-INF.services under an "internal" attribute 
  so that it can be seen only by the bundle itself without following the 
  DynamicImport-Package * 
-Export-Package: org.apache.tuscany.sca.core;uses:="org.apache.tuscany.
- sca.extensibility";version="2.0.0",org.apache.tuscany.sca.extensibility
- ;version="2.0.0"
+Export-Package: org.apache.tuscany.sca.core;version="2.0.0";
+ uses:="org.apache.tuscany.sca.extensibility",
+ org.apache.tuscany.sca.extensibility;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Extensibility
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
diff --git a/java/sca/modules/monitor/META-INF/MANIFEST.MF b/java/sca/modules/monitor/META-INF/MANIFEST.MF
index 2a3d59609f..161cbe7a8c 100644
--- a/java/sca/modules/monitor/META-INF/MANIFEST.MF
+++ b/java/sca/modules/monitor/META-INF/MANIFEST.MF
@@ -1,7 +1,5 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.monitor;version="2.0.0"
-Private-Package: org.apache.tuscany.sca.monitor.impl;version="2.0.0"
-Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Monitor
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
index a1907800ff..2094b9cdad 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Import-Package: javax.management;resolution:=optional,
  javax.xml.stream,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.common.java.io;version="2.0.0",
  org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
  org.apache.tuscany.sca.context;version="2.0.0",
@@ -36,20 +35,15 @@ Import-Package: javax.management;resolution:=optional,
  org.apache.tuscany.sca.definitions.util;version="2.0.0",
  org.apache.tuscany.sca.definitions.xml;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0",
- org.apache.tuscany.sca.interfacedef;version="2.0.0",
- org.apache.tuscany.sca.interfacedef.java;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.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;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";resolution:=optional,
- org.oasisopen.sca.client;version="2.0.0"
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/sca-api/META-INF/MANIFEST.MF b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
index 82b979e9b9..2120e72d06 100644
--- a/java/sca/modules/sca-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
-Export-Package: org.oasisopen.sca.annotation;version="2.0.0",org.oasisopen.sca;us
- es:="javax.security.auth";version="2.0.0",org.oasisopen.sca.client;version="2.0.0"
+Export-Package: org.oasisopen.sca;version="2.0.0";uses:="javax.security.auth",
+ org.oasisopen.sca.annotation;version="2.0.0",
+ org.oasisopen.sca.client;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA API
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
diff --git a/java/sca/modules/sca-client-impl/META-INF/MANIFEST.MF b/java/sca/modules/sca-client-impl/META-INF/MANIFEST.MF
index a472877dd7..c121ce7830 100644
--- a/java/sca/modules/sca-client-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/sca-client-impl/META-INF/MANIFEST.MF
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.client.impl;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Client Impl
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -9,10 +8,8 @@ Bnd-LastModified: 1225397189093
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Client Impl
-Import-Package: org.apache.tuscany.sca.client.impl;version="2.0.0",
- org.apache.tuscany.sca.node;version="2.0.0",
+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
  org.oasisopen.sca;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
  org.oasisopen.sca.client;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.client.impl
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/xsd/META-INF/MANIFEST.MF b/java/sca/modules/xsd/META-INF/MANIFEST.MF
index ab10d33283..b8bb9642f1 100644
--- a/java/sca/modules/xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/xsd/META-INF/MANIFEST.MF
@@ -2,20 +2,19 @@ Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.xsd;version="2.0.0";
   uses:="org.apache.ws.commons.schema,
    org.apache.tuscany.sca.assembly,
-   org.w3c.dom,javax.xml.namespace",
+   org.apache.tuscany.sca.xsd.impl,
+   org.w3c.dom,
+   javax.xml.namespace",
  org.apache.tuscany.sca.xsd.xml;version="2.0.0";
-  uses:="org.apache.ws.commons.schema,
-   org.apache.ws.commons.schema.resolver,
+  uses:="org.apache.ws.commons.schema.resolver,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.contribution.processor,
    org.apache.tuscany.sca.contribution,
+   org.apache.tuscany.sca.xsd,
    org.apache.tuscany.sca.core,
    org.apache.tuscany.sca.monitor,
-   org.w3c.dom,
-   org.apache.tuscany.sca.contribution.namespace,
-   javax.xml.namespace,
    org.xml.sax,
-   javax.xml.stream,
-   org.apache.tuscany.sca.contribution.resolver,
-   org.apache.tuscany.sca.contribution.processor"
+   javax.xml.namespace"
 Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA XSD Model