5 files changed, 28 insertions, 23 deletions
diff --git a/java/sca/modules/core-spi/META-INF/MANIFEST.MF b/java/sca/modules/core-spi/META-INF/MANIFEST.MF
index 286ee65ecc..360dea4288 100644
--- a/java/sca/modules/core-spi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core-spi/META-INF/MANIFEST.MF
@@ -1,21 +1,28 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.invocation;uses:="org.apache.tu
- scany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="2.0.0",
- org.apache.tuscany.sca.runtime;uses:="org.apache.tuscany.sca.invocati
- on,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.endpointres
- olver,org.apache.tuscany.sca.provider,org.oasisopen.sca,org.apache.tuscany
- .sca.interfacedef";version="2.0.0",org.apache.tuscany.sca.context;uses:
- ="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.
- apache.tuscany.sca.core,org.oasisopen.sca,org.apache.tuscany.sca.extensibi
- lity";version="2.0.0",org.apache.tuscany.sca.provider;uses:="org.apache
- .tuscany.sca.invocation,org.apache.tuscany.sca.runtime,org.apache.tus
- cany.sca.assembly,org.apache.tuscany.sca.definitions,org.apache.tusca
- ny.sca.core,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sc
- a.extensibility";version="2.0.0",org.apache.tuscany.sca.endpointresolve
- r;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,
- org.apache.tuscany.sca.extensibility";version="2.0.0",org.apache.tuscan
- y.sca.work;version="2.0.0",org.apache.tuscany.sca.management;uses:="org
- .apache.tuscany.sca.runtime";version="2.0.0"
+Export-Package: org.apache.tuscany.sca.context;version="2.0.0";
+  uses:="org.apache.tuscany.sca.runtime,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.core,
+   org.oasisopen.sca,
+   org.apache.tuscany.sca.extensibility",
+ org.apache.tuscany.sca.invocation;version="2.0.0";uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.interfacedef",
+ org.apache.tuscany.sca.management;version="2.0.0";uses:="org.apache.tuscany.sca.runtime",
+ org.apache.tuscany.sca.provider;version="2.0.0";
+  uses:="org.apache.tuscany.sca.invocation,
+   org.apache.tuscany.sca.runtime,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.definitions,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.interfacedef,
+   org.apache.tuscany.sca.extensibility",
+ org.apache.tuscany.sca.runtime;version="2.0.0";
+  uses:="org.apache.tuscany.sca.invocation,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.endpointresolver,
+   org.apache.tuscany.sca.provider,
+   org.oasisopen.sca,
+   org.apache.tuscany.sca.interfacedef",
+ org.apache.tuscany.sca.work;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Core SPI
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -29,7 +36,6 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.context;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.endpointresolver;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.invocation;version="2.0.0",
@@ -38,7 +44,6 @@ Import-Package: org.apache.tuscany.sca.assembly;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"
 Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/core/META-INF/MANIFEST.MF b/java/sca/modules/core/META-INF/MANIFEST.MF
index 18673f6cc5..bf041ff96a 100644
--- a/java/sca/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core/META-INF/MANIFEST.MF
@@ -64,7 +64,6 @@ Import-Package: javax.naming,
  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.endpointresolver;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.impl;version="2.0.0";resolution:=optional,
diff --git a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
index ce2d849ba9..d63c140248 100644
--- a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -20,14 +20,15 @@ Import-Package: javax.xml.namespace,
  org.apache.axiom.om.impl.builder,
  org.apache.axiom.om.impl.llom.factory;resolution:=optional,
  org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,
- org.apache.axiom.soap.impl.llom.soap12;resolution:=optional, 
+ org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,
  org.apache.tuscany.sca.databinding;version="2.0.0",
  org.apache.tuscany.sca.databinding.axiom;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",
- org.apache.tuscany.sca.interfacedef.util;version="1.4"
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom
 Fragment-Host: org.apache.ws.commons.axiom.axiom-api
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding/META-INF/MANIFEST.MF b/java/sca/modules/databinding/META-INF/MANIFEST.MF
index 8dc3e90df5..5cb33c9e40 100644
--- a/java/sca/modules/databinding/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding/META-INF/MANIFEST.MF
@@ -56,6 +56,7 @@ Import-Package: javax.xml.datatype,
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.xsd;version="2.0.0",
  org.w3c.dom,
  org.xml.sax,
diff --git a/java/sca/modules/endpoint/META-INF/MANIFEST.MF b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
index 8b8122ecc1..2661b75c8d 100644
--- a/java/sca/modules/endpoint/META-INF/MANIFEST.MF
+++ b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Import-Package: javax.xml.stream;resolution:=optional,
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.core.assembly;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
- org.apache.tuscany.sca.endpointresolver;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,