3 files changed, 34 insertions, 54 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