3 files changed, 80 insertions, 52 deletions
diff --git a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
index 77c5880edc..2f381876ea 100644
--- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
@@ -12,24 +12,34 @@ Bnd-LastModified: 1225397235359
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Core/DataBinding Integration
-Import-Package: javax.xml.bind.annotation.adapters,javax.xml.namespace
- ,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,org.
- apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.cont
- ribution.resolver;version="1.4",org.apache.tuscany.sca.core;version="
- 1.4",org.apache.tuscany.sca.core.context;version="1.4",org.apache.tus
- cany.sca.databinding;version="1.4",org.apache.tuscany.sca.databinding
- .annotation;version="1.4",org.apache.tuscany.sca.databinding.impl;ver
- sion="1.4",org.apache.tuscany.sca.databinding.jaxb;version="1.4",org.
- apache.tuscany.sca.databinding.xml;version="1.4",org.apache.tuscany.s
- ca.interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.imp
- l;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4
- ",org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",o
- rg.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",org.apach
- e.tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.
- invocation;version="1.4",org.apache.tuscany.sca.runtime;version="1.4"
- ,org.apache.tuscany.sca.xsd;version="1.4",org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",org.w3c.dom;resolution:=option
- al,org.junit;resolution:=optional
+Import-Package: javax.xml.bind.annotation.adapters,
+ javax.xml.namespace,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.transform.stream,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.contribution.resolver;version="1.4",
+ org.apache.tuscany.sca.core;version="1.4",
+ org.apache.tuscany.sca.core.context;version="1.4",
+ org.apache.tuscany.sca.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.annotation;version="1.4",
+ org.apache.tuscany.sca.databinding.impl;version="1.4",
+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",
+ org.apache.tuscany.sca.databinding.xml;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.xsd;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4",
+ org.w3c.dom;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
index 012d96995f..1375fdb56b 100644
--- a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
@@ -25,16 +25,21 @@ Bnd-LastModified: 1225397108125
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Core SPI
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.core;vers
- ion="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.apache
- .tuscany.sca.endpointresolver;version="1.4",org.apache.tuscany.sca.ex
- tensibility;version="1.4",org.apache.tuscany.sca.interfacedef;version
- ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus
- cany.sca.management;version="1.4",org.apache.tuscany.sca.provider;ver
- sion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tu
- scany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.junit;res
- olution:=optional
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.context;version="1.4",
+ org.apache.tuscany.sca.core;version="1.4",
+ org.apache.tuscany.sca.definitions;version="1.4",
+ org.apache.tuscany.sca.endpointresolver;version="1.4",
+ org.apache.tuscany.sca.extensibility;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.management;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.work;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
index 99ccbb2124..7e5c8eddaf 100644
--- a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
@@ -47,30 +47,43 @@ 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: commonj.work,javax.naming,javax.security.auth,javax.xm
- l.namespace,javax.xml.stream,net.sf.cglib.proxy,org.apache.tuscany.sc
- a.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;vers
- ion="1.4",org.apache.tuscany.sca.assembly.impl;version="1.4",org.apac
- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.contribut
- ion.processor;version="1.4",org.apache.tuscany.sca.contribution.resol
- ver;version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apach
- e.tuscany.sca.core.assembly;version="1.4",org.apache.tuscany.sca.core
- .context;version="1.4",org.apache.tuscany.sca.core.conversation;versi
- on="1.4",org.apache.tuscany.sca.core.factory;version="1.4",org.apache
- .tuscany.sca.core.invocation;version="1.4",org.apache.tuscany.sca.cor
- e.scope;version="1.4",org.apache.tuscany.sca.core.work;version="1.4",
- org.apache.tuscany.sca.endpointresolver;version="1.4",org.apache.tusc
- any.sca.extensibility;version="1.4",org.apache.tuscany.sca.interfaced
- ef;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.
- 4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache.
- tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monitor;v
- ersion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache
- .tuscany.sca.runtime;version="1.4",org.apache.tuscany.sca.work;versio
- n="1.4",org.osoa.sca;version="1.4",org.osoa.sca.annotations;version="
- 1.4",org.junit;resolution:=optional,junit.framework;resolution:=optio
- nal,org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution
- :=optional,org.apache.tuscany.sca.core.wire;version="1.4";resolution:
- =optional
+Import-Package: commonj.work,
+ javax.naming,
+ javax.security.auth,
+ javax.xml.namespace,
+ javax.xml.stream,
+ junit.framework;resolution:=optional,
+ net.sf.cglib.proxy,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.builder;version="1.4",
+ org.apache.tuscany.sca.assembly.impl;version="1.4",
+ org.apache.tuscany.sca.context;version="1.4",
+ org.apache.tuscany.sca.contribution.processor;version="1.4",
+ org.apache.tuscany.sca.contribution.resolver;version="1.4",
+ org.apache.tuscany.sca.core;version="1.4",
+ org.apache.tuscany.sca.core.assembly;version="1.4",
+ org.apache.tuscany.sca.core.context;version="1.4",
+ org.apache.tuscany.sca.core.conversation;version="1.4",
+ org.apache.tuscany.sca.core.factory;version="1.4",
+ org.apache.tuscany.sca.core.invocation;version="1.4",
+ org.apache.tuscany.sca.core.scope;version="1.4",
+ org.apache.tuscany.sca.core.wire;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.core.work;version="1.4",
+ org.apache.tuscany.sca.endpointresolver;version="1.4",
+ org.apache.tuscany.sca.extensibility;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.work;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.core
 Bundle-DocURL: http://www.apache.org/