3 files changed, 48 insertions, 37 deletions
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index 8301d356de..6a859242ec 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
@@ -26,28 +26,35 @@ Bnd-LastModified: 1225397187218
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Java Implementation Model
-Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
- rsion="1.4",org.apache.tuscany.sca.context;version="1.4",org.apache.t
- uscany.sca.core;version="1.4",org.apache.tuscany.sca.core.context;ver
- sion="1.4",org.apache.tuscany.sca.core.factory;version="1.4",org.apac
- he.tuscany.sca.core.invocation;version="1.4",org.apache.tuscany.sca.c
- ore.scope;version="1.4",org.apache.tuscany.sca.databinding;version="1
- .4",org.apache.tuscany.sca.databinding.impl;version="1.4",org.apache.
- tuscany.sca.databinding.xml;version="1.4",org.apache.tuscany.sca.impl
- ementation.java;version="1.4",org.apache.tuscany.sca.implementation.j
- ava.context;version="1.4",org.apache.tuscany.sca.implementation.java.
- injection;version="1.4",org.apache.tuscany.sca.implementation.java.in
- trospect;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.i
- nterfacedef.java.impl;version="1.4",org.apache.tuscany.sca.interfaced
- ef.util;version="1.4",org.apache.tuscany.sca.invocation;version="1.4"
- ,org.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.p
- olicy.util;version="1.4",org.apache.tuscany.sca.provider;version="1.4
- ",org.apache.tuscany.sca.runtime;version="1.4",org.osoa.sca;version="
- 1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,junit.framewo
- rk;resolution:=optional,org.apache.tuscany.sca.implementation.java.in
- vocation;resolution:=optional
+Import-Package: javax.xml.namespace,
+ 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.core.context;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.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.impl;version="1.4",
+ org.apache.tuscany.sca.databinding.xml;version="1.4",
+ org.apache.tuscany.sca.implementation.java;version="1.4",
+ org.apache.tuscany.sca.implementation.java.context;version="1.4",
+ org.apache.tuscany.sca.implementation.java.injection;version="1.4",
+ org.apache.tuscany.sca.implementation.java.introspect;version="1.4",
+ org.apache.tuscany.sca.implementation.java.invocation;resolution:=optional,
+ 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.impl;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",
+ org.apache.tuscany.sca.policy.util;version="1.4",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4",
+ org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim
  e
 Bundle-DocURL: http://www.apache.org/
diff --git a/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
index 3ef156b005..0dd3619b87 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
@@ -16,20 +16,24 @@ Bnd-LastModified: 1225397170750
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Java Implementation XML Model
-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers
- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"
- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach
- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementatio
- n.java;version="1.4",org.apache.tuscany.sca.implementation.java.intro
- spect;version="1.4",org.apache.tuscany.sca.implementation.java.xml;ve
- rsion="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apa
- che.tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sc
- a.monitor;version="1.4",org.apache.tuscany.sca.policy;version="1.4",o
- rg.osoa.sca.annotations;version="1.4";resolution:=optional,org.apache
- .tuscany.sca.definitions;resolution:=optional,org.junit;resolution:=o
- ptional,junit.framework;resolution:=optional,org.apache.tuscany.sca.a
- ssembly.builder;version="1.4";resolution:=optional
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ 
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.assembly.xml;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.implementation.java;version="1.4",
+ org.apache.tuscany.sca.implementation.java.introspect;version="1.4",
+ org.apache.tuscany.sca.implementation.java.xml;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4",
+ 
+ org.osoa.sca.annotations;version="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
index dac8ee6576..d86b52e726 100644
--- a/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Java Implementation Model
 Import-Package: javax.jws,
  javax.xml.namespace,
- junit.framework;resolution:=optional,
+ 
  org.apache.tuscany.sca.assembly;version="1.4",
  org.apache.tuscany.sca.assembly.impl;version="1.4",
  org.apache.tuscany.sca.core;version="1.4",