Adjust optional dependencies from test cases to avoid duplicate classpath entries (from PDE requiredPlugins classpath container or explicit classpath entries)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@714138 13f79535-47bb-0310-9956-ffa450edef68

82 files changed, 454 insertions, 398 deletions

diff --git a/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
index 003ddfea4d..ba09044111 100644
--- a/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream
  ca.interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.imp

  l;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apac

  he.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.policy.uti

- l;version="1.4",org.w3c.dom,org.junit;resolution:=optional,org.xml.sa

- x;resolution:=optional,junit.framework;resolution:=optional,javax.xml

+ l;version="1.4",org.w3c.dom,org.xml.sa

+ x;resolution:=optional,javax.xml

  .validation;resolution:=optional,org.apache.tuscany.sca.assembly.buil

  der;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xml

diff --git a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
index fd94542249..11a82b4e4f 100644
--- a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
@@ -20,18 +20,25 @@ Bnd-LastModified: 1225397097203
 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.transf

- orm,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.xpath,o

- rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.a

- ssembly.builder;version="1.4",org.apache.tuscany.sca.assembly.impl;ve

- rsion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tusc

- any.sca.definitions;version="1.4",org.apache.tuscany.sca.extensibilit

- y;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org

- .apache.tuscany.sca.monitor;version="1.4",org.apache.tuscany.sca.poli

- cy;version="1.4",org.apache.tuscany.sca.policy.util;version="1.4",org

- .w3c.dom,org.xml.sax,junit.framework;resolution:=optional,org.apache.

- tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,org.

- junit;resolution:=optional

+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="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.assembly.impl;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;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.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.util;version="1.4",

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.assembly

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
index 0502c76f96..8e52c6f2a8 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Import-Package: javax.activation;version="1.1";resolution:=optional,
  javax.servlet,

  javax.servlet.http,

  javax.xml.namespace,

- junit.framework;resolution:=optional,

+ 

  org.apache.abdera,

  org.apache.abdera.factory,

  org.apache.abdera.i18n.iri,

@@ -44,11 +44,10 @@ Import-Package: javax.activation;version="1.1";resolution:=optional,
  org.apache.tuscany.sca.interfacedef.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.node;resolution:=optional,

  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.junit;resolution:=optional,

+ 

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera

diff --git a/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
index f6520656ab..4b58729aa2 100644
--- a/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
@@ -12,13 +12,12 @@ Bnd-LastModified: 1225397253156
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension

-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.binding.atom;version="1.4",org.apache.tuscany.sca.poli

- cy;version="1.4",javax.xml.stream;resolution:=optional,org.apache.tus

- cany.sca.contribution.processor;resolution:=optional,org.apache.tusca

- ny.sca.core;version="1.4";resolution:=optional,org.apache.tuscany.sca

- .monitor;version="1.4";resolution:=optional,org.junit;resolution:=opt

- ional

+Import-Package: javax.xml.stream;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.atom;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.monitor;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
index d9cecc82a2..88a38c8dc1 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
@@ -32,27 +32,33 @@ Bnd-LastModified: 1225397143078
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA CORBA Binding Runtime

-Import-Package: net.sf.cglib.proxy,org.apache.tuscany.sca.assembly;ver

- sion="1.4",org.apache.tuscany.sca.binding.corba;version="1.4",org.apa

- che.tuscany.sca.binding.corba.provider;version="1.4",org.apache.tusca

- ny.sca.binding.corba.provider.exceptions;version="1.4",org.apache.tus

- cany.sca.binding.corba.provider.reference;version="1.4",org.apache.tu

- scany.sca.binding.corba.provider.service;version="1.4",org.apache.tus

- cany.sca.binding.corba.provider.types;version="1.4",org.apache.tuscan

- y.sca.core;version="1.4",org.apache.tuscany.sca.host.corba;version="1

- .4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tusc

- any.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.invoca

- tion;version="1.4",org.apache.tuscany.sca.provider;version="1.4",org.

- apache.tuscany.sca.runtime;version="1.4",org.omg.CORBA,org.omg.CORBA.

- portable,org.osoa.sca;version="1.4",org.apache.tuscany.sca.interfaced

- ef.util;version="1.4";resolution:=optional,org.apache.tuscany.sca.bin

- ding.corba.provider.meta;resolution:=optional,org.apache.tuscany.sca.

- policy;version="1.4";resolution:=optional,javax.xml.namespace;resolut

- ion:=optional,junit.framework;resolution:=optional,org.apache.tuscany

- .sca.binding.corba.provider.types.util;resolution:=optional,org.omg.C

- osNaming;resolution:=optional,org.apache.tuscany.sca.binding.corba.pr

- ovider.util;resolution:=optional,org.apache.tuscany.sca.host.corba.na

- ming;resolution:=optional,org.junit;resolution:=optional

+Import-Package: javax.xml.namespace;resolution:=optional,

+ 

+ net.sf.cglib.proxy,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.corba;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.exceptions;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.meta;resolution:=optional,

+ org.apache.tuscany.sca.binding.corba.provider.reference;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.service;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.types;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.types.util;resolution:=optional,

+ org.apache.tuscany.sca.binding.corba.provider.util;resolution:=optional,

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.corba;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ 

+ org.omg.CORBA,

+ org.omg.CORBA.portable,

+ org.omg.CosNaming;resolution:=optional,

+ org.osoa.sca;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 952edebf5d..464fe479a3 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Import-Package: javax.ejb,
  javax.naming,

  javax.rmi,

  javax.rmi.CORBA,

- junit.framework;resolution:=optional,

+ 

  net.sf.cglib.core,

  net.sf.cglib.proxy,

  org.apache.tuscany.sca.assembly;version="1.4",

@@ -25,7 +25,6 @@ Import-Package: javax.ejb,
  org.apache.tuscany.sca.interfacedef;version="1.4",

  org.apache.tuscany.sca.interfacedef.java;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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",

diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
index 2d026b6b5f..91b9519b28 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@ Import-Package: com.google.gdata.client,
  javax.servlet,

  javax.servlet.http,

  javax.xml.namespace,

- junit.framework;resolution:=optional,

  org.apache.commons.codec.binary,

  org.apache.commons.httpclient,

  org.apache.commons.httpclient.auth,

@@ -39,11 +38,9 @@ Import-Package: com.google.gdata.client,
  org.apache.tuscany.sca.interfacedef.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.node;resolution:=optional,

  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.junit;resolution:=optional,

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime

diff --git a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 472a6c6617..edd51d7c48 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
@@ -12,14 +12,13 @@ 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,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4",

  org.apache.tuscany.sca.binding.http;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.host.http;version="1.4",

  org.apache.tuscany.sca.interfacedef;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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",

diff --git a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
index f91d062184..0e2a393734 100644
--- a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JMS Binding Model

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4",

  org.apache.tuscany.sca.assembly.xml;version="1.4",

  org.apache.tuscany.sca.binding.jms;version="1.4",

diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 44579f29ba..66b107609d 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
@@ -16,12 +16,10 @@ 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,

- com.meterware.httpunit;resolution:=optional,

  javax.servlet,

  javax.servlet.http,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4",

- org.apache.tuscany.sca.assembly.xml,

  org.apache.tuscany.sca.binding.jsonrpc;version="1.4",

  org.apache.tuscany.sca.binding.jsonrpc.provider;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

@@ -31,12 +29,11 @@ Import-Package: com.metaparadigm.jsonrpc,
  org.apache.tuscany.sca.interfacedef;version="1.4",

  org.apache.tuscany.sca.interfacedef.java;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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.json,

- org.junit;resolution:=optional,

+ 

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime

diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 02aa4127e5..7c0706f387 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Bnd-LastModified: 1225397324375
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA RMI Binding Extension

-Import-Package: junit.framework;resolution:=optional,

- net.sf.cglib.asm,

+Import-Package: net.sf.cglib.asm,

  net.sf.cglib.core,

  net.sf.cglib.proxy,

  org.apache.tuscany.sca.assembly;version="1.4",

@@ -22,11 +21,9 @@ Import-Package: junit.framework;resolution:=optional,
  org.apache.tuscany.sca.interfacedef.java;version="1.4",

  org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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.junit;resolution:=optional,

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi.runtime

diff --git a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
index cc89338e1f..b76536e0f5 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
@@ -29,7 +29,6 @@ Import-Package: com.sun.syndication.feed.atom,
  org.apache.tuscany.sca.interfacedef.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.node;resolution:=optional,

  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",

diff --git a/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
index 07abf859aa..c4c462c6dd 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
@@ -11,22 +11,25 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Axis2-based Default Binding Ext

  ension

-Import-Package: org.apache.axiom.om,org.apache.tuscany.sca.assembly;ve

- rsion="1.4",org.apache.tuscany.sca.binding.sca;version="1.4",org.apac

- he.tuscany.sca.binding.ws;version="1.4",org.apache.tuscany.sca.bindin

- g.ws.axis2;version="1.4",org.apache.tuscany.sca.binding.ws.wsdlgen;ve

- rsion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tusc

- any.sca.core.assembly;version="1.4",org.apache.tuscany.sca.databindin

- g;version="1.4",org.apache.tuscany.sca.host.http;version="1.4",org.ap

- ache.tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.in

- vocation;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",o

- rg.apache.tuscany.sca.policy.util;version="1.4",org.apache.tuscany.sc

- a.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";re

- solution:=optional,org.apache.tuscany.sca.node;resolution:=optional,o

- rg.junit;resolution:=optional,junit.framework;resolution:=optional,or

- g.apache.tuscany.sca.endpointresolver;version="1.4";resolution:=optio

- nal

+Import-Package: org.apache.axiom.om,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.sca;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.axis2;version="1.4",

+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.endpointresolver;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;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";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
index 9b3d460a66..20a51c6a7a 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Default Binding XML Model

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

  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",

@@ -21,8 +20,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,

  org.apache.tuscany.sca.interfacedef;version="1.4.0",

  org.apache.tuscany.sca.monitor;version="1.4",

- org.apache.tuscany.sca.policy;version="1.4",

- org.junit;resolution:=optional

+ org.apache.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
index 6fa343d3f5..582b72660e 100644
--- a/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
@@ -24,8 +24,8 @@ Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  tion:=optional,org.apache.tuscany.sca.assembly.builder.impl;resolutio

  n:=optional,org.apache.tuscany.sca.contribution;version="1.4";resolut

  ion:=optional,org.apache.tuscany.sca.monitor;version="1.4";resolution

- :=optional,org.junit;resolution:=optional,javax.xml.stream;resolution

- :=optional,junit.framework;resolution:=optional,org.apache.tuscany.sc

+ :=optional,javax.xml.stream;resolution

+ :=optional,org.apache.tuscany.sc

  a.assembly.xml;version="1.4";resolution:=optional,org.apache.tuscany.

  sca.contribution.resolver;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca

diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
index bb70e86671..0fe5e5af3e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
@@ -37,7 +37,7 @@ Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver
  rsion="1.4",org.apache.tuscany.sca.policy;version="1.4",org.apache.tu

  scany.sca.policy.util;version="1.4",org.apache.tuscany.sca.provider;v

  ersion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.osoa.sc

- a;version="1.4",junit.framework;resolution:=optional

+ a;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.ws

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 9715903204..1ab1663121 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -54,7 +54,6 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  javax.xml.stream;version="1.0",

  javax.xml.transform,

  javax.xml.transform.dom,

- junit.framework;resolution:=optional,

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

  org.apache.axiom.om.util,

@@ -94,7 +93,6 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  org.apache.tuscany.sca.interfacedef.util;version="1.4",

  org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  org.apache.tuscany.sca.policy;version="1.4",

  org.apache.tuscany.sca.policy.authentication.basic;version="1.4",

  org.apache.tuscany.sca.policy.security.ws;version="1.4",

@@ -107,7 +105,6 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  org.apache.ws.commons.schema.resolver,

  org.apache.ws.security,

  org.apache.ws.security.handler,

- org.junit;resolution:=optional,

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4";resolution:=optional,

  org.w3c.dom,

diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
index 9a0c67a292..10b8a87794 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
@@ -21,30 +21,40 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Web Service binding WSDL Genera

  tor

-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions

- .schema,javax.wsdl.extensions.soap,javax.wsdl.extensions.soap12,javax

- .wsdl.factory,javax.wsdl.xml,javax.xml.namespace;version="1.0",javax.

- xml.parsers,org.apache.tuscany.sca.assembly;version="1.4",org.apache.

- tuscany.sca.binding.ws;version="1.4",org.apache.tuscany.sca.binding.w

- s.wsdlgen;version="1.4",org.apache.tuscany.sca.contribution.resolver;

- version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tu

- scany.sca.databinding;version="1.4",org.apache.tuscany.sca.databindin

- g.jaxb;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4

- ",org.apache.tuscany.sca.interfacedef.java;version="1.4",org.apache.t

- uscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.int

- erfacedef.wsdl;version="1.4",org.apache.tuscany.sca.monitor;version="

- 1.4",org.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.s

- ca.xsd;version="1.4",org.apache.ws.commons.schema,org.apache.ws.commo

- ns.schema.utils,org.osoa.sca;version="1.4",org.w3c.dom,javax.jws;reso

- lution:=optional,org.apache.tuscany.sca.interfacedef.java.jaxws;versi

- on="1.4";resolution:=optional,junit.framework;resolution:=optional,or

- g.osoa.sca.annotations;version="1.4";resolution:=optional,org.apache.

- tuscany.sca.contribution;version="1.4";resolution:=optional,org.junit

- ;resolution:=optional,org.apache.tuscany.sca.core.databinding.process

- or;resolution:=optional,org.apache.tuscany.sca.xsd.xml;version="1.4";

- resolution:=optional,javax.xml.bind.annotation;resolution:=optional,j

- avax.xml.ws;resolution:=optional;org.apache.tuscany.sca.core.databind

- ing.processor;resolution:=optional

+Import-Package: javax.jws;resolution:=optional,

+ javax.wsdl,

+ javax.wsdl.extensions,

+ javax.wsdl.extensions.schema,

+ javax.wsdl.extensions.soap,

+ javax.wsdl.extensions.soap12,

+ javax.wsdl.factory,

+ javax.wsdl.xml,

+ javax.xml.bind.annotation;resolution:=optional,

+ javax.xml.namespace;version="1.0",

+ javax.xml.parsers,

+ javax.xml.ws;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sca.xsd.xml;version="1.4";resolution:=optional,

+ org.apache.ws.commons.schema,

+ org.apache.ws.commons.schema.utils,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional,

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.wsdlgen

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
index dbbcd00f34..21bd559fdc 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Import-Package: javax.wsdl,
  org.apache.tuscany.sca.monitor;version="1.4",

  org.apache.tuscany.sca.policy;version="1.4",

  org.apache.tuscany.sca.xsd;version="1.4.0",

- org.junit;resolution:=optional,

+ 

  org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.xml

 Bundle-DocURL: http://www.apache.org/

diff --git a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
index ed042fc9b2..7d338e5322 100644
--- a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Java Import/Export Model

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

  org.apache.tuscany.sca.assembly;version="1.4.0",

  org.apache.tuscany.sca.contribution;version="1.4",

  org.apache.tuscany.sca.contribution.java;version="1.4",

@@ -23,8 +22,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.contribution.resolver;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.extensibility;version="1.4",

- org.apache.tuscany.sca.monitor;version="1.4",

- org.junit;resolution:=optional

+ org.apache.tuscany.sca.monitor;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.java

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
index bfdb174046..d369b9de49 100644
--- a/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
@@ -12,13 +12,14 @@ Bnd-LastModified: 1225397110468
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Namespace Import/Export Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.

- namespace;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

- .monitor;version="1.4",junit.framework;resolution:=optional,org.junit

- ;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.namespace;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.monitor;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.namespace

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
index a56da107f4..71371fa9fd 100644
--- a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
@@ -20,8 +20,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.contribution.resolver;version="1.4",

  org.apache.tuscany.sca.contribution.resource;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

- org.apache.tuscany.sca.monitor;version="1.4",

- org.junit;resolution:=optional

+ org.apache.tuscany.sca.monitor;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.resource

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
index 556fefafe8..4f8d3ee0f8 100644
--- a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.monitor;version="1.4",

  org.apache.tuscany.sca.policy;version="1.4.0",

- org.junit;resolution:=optional,

+ 

  org.w3c.dom,

  org.w3c.dom.traversal

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.xml

diff --git a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
index 2a04c04043..d0a5651923 100644
--- a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
@@ -24,17 +24,23 @@ Bnd-LastModified: 1225397102546
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Contribution Model

-Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.stream.

- util,javax.xml.transform,javax.xml.transform.stream,javax.xml.validat

- ion,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.

- sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.pr

- ocessor;version="1.4",org.apache.tuscany.sca.contribution.resolver;ve

- rsion="1.4",org.apache.tuscany.sca.contribution.scanner;version="1.4"

- ,org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.ext

- ensibility;version="1.4",org.apache.tuscany.sca.monitor;version="1.4"

- ,org.apache.tuscany.sca.policy;version="1.4",org.xml.sax,org.xml.sax.

- helpers,junit.framework;resolution:=optional,org.junit;resolution:=op

- tional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ javax.xml.stream.util,

+ javax.xml.transform,

+ javax.xml.transform.stream,

+ javax.xml.validation,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution;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.contribution.scanner;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.xml.sax,

+ org.xml.sax.helpers

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution

 Bundle-DocURL: http://www.apache.org/

 

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 17695ced16..e8d9bcbce0 100644
--- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
@@ -37,7 +37,7 @@ Import-Package: javax.xml.bind.annotation.adapters,
  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

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 1375fdb56b..12b9a19364 100644
--- a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Import-Package: org.apache.tuscany.sca.assembly;version="1.4",
  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 7e5c8eddaf..bb0f164a14 100644
--- a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
@@ -52,7 +52,7 @@ Import-Package: commonj.work,
  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",

@@ -81,7 +81,7 @@ Import-Package: commonj.work,
  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

diff --git a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
index d7cb0bf1ac..531d72f3a0 100644
--- a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Import-Package: javax.xml.namespace,javax.xml.stream;version="1.0",org
  ,org.apache.tuscany.sca.databinding.javabeans;version="1.4",org.apach

  e.tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.inter

  facedef.impl;version="1.4",org.apache.tuscany.sca.interfacedef.util;v

- ersion="1.4",junit.framework;resolution:=optional

+ ersion="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
index db8e3c9731..bf9b73f728 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Import-Package: com.sun.xml.fastinfoset,
  com.sun.xml.fastinfoset.stax,

  javax.xml.parsers,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  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",

diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index 0daa6dc7fb..636cbe1283 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
@@ -11,20 +11,28 @@ Bnd-LastModified: 1225397336953
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Data Binding for JAXB-AXIOM

-Import-Package: javax.xml.bind,javax.xml.bind.attachment,javax.xml.nam

- espace,javax.xml.stream;version="1.0",javax.xml.transform,javax.xml.t

- ransform.stream,org.apache.axiom.om,org.apache.axiom.om.ds,org.apache

- .axiom.om.impl,org.apache.axiom.om.impl.builder,org.apache.axiom.om.u

- til,org.apache.tuscany.sca.databinding;version="1.4",org.apache.tusca

- ny.sca.databinding.impl;version="1.4",org.apache.tuscany.sca.databind

- ing.jaxb;version="1.4",org.apache.tuscany.sca.interfacedef;version="1

- .4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache

- .tuscany.sca.databinding.xml;version="1.4";resolution:=optional,org.j

- unit;resolution:=optional,org.w3c.dom;resolution:=optional,javax.xml.

- datatype;resolution:=optional,org.apache.tuscany.sca.databinding.jaxb

- .axiom;resolution:=optional,junit.framework;resolution:=optional,java

- x.xml.bind.annotation;resolution:=optional,org.apache.tuscany.sca.int

- erfacedef.impl;version="1.4";resolution:=optional

+Import-Package: javax.xml.bind,

+ javax.xml.bind.annotation;resolution:=optional,

+ javax.xml.bind.attachment,

+ javax.xml.datatype;resolution:=optional,

+ javax.xml.namespace,

+ javax.xml.stream;version="1.0",

+ javax.xml.transform,

+ javax.xml.transform.stream,

+ org.apache.axiom.om,

+ org.apache.axiom.om.ds,

+ org.apache.axiom.om.impl,

+ org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.util,

+ org.apache.tuscany.sca.databinding;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.jaxb.axiom;resolution:=optional,

+ org.apache.tuscany.sca.databinding.xml;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.w3c.dom;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb.axiom

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
index 4b5f491022..f07a915800 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: javax.activation,
  javax.xml.transform,

  javax.xml.transform.dom,

  javax.xml.transform.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4.0",

  org.apache.tuscany.sca.contribution.resolver;version="1.4",

  org.apache.tuscany.sca.databinding;version="1.4",

@@ -44,7 +44,7 @@ Import-Package: javax.activation,
  org.apache.tuscany.sca.policy;version="1.4.0",

  org.apache.tuscany.sca.xsd;version="1.4",

  org.apache.ws.commons.schema.resolver,

- org.junit;resolution:=optional,

+ 

  org.osoa.sca;version="1.4",

  org.w3c.dom,

  org.xml.sax

diff --git a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
index 5c3b5f80fd..89670b57f8 100644
--- a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Bundle-Description: Apache Tuscany SCA Data Binding for JSON
 Import-Package: com.metaparadigm.jsonrpc,

  javax.xml.namespace,

  javax.xml.stream;version="1.0",

- junit.framework;resolution:=optional,

+ 

  org.apache.axiom.om,

  org.apache.tuscany.sca.databinding;version="1.4",

  org.apache.tuscany.sca.databinding.impl;version="1.4",

@@ -27,7 +27,7 @@ Import-Package: com.metaparadigm.jsonrpc,
  org.codehaus.jettison.json,

  org.codehaus.jettison.mapped,

  org.json,

- org.junit;resolution:=optional,

+ 

  org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json

 Bundle-DocURL: http://www.apache.org/

diff --git a/branches/sca-equinox/modules/databinding-json/pom.xml b/branches/sca-equinox/modules/databinding-json/pom.xml
index 84bee5f963..e21d8e5dbf 100644
--- a/branches/sca-equinox/modules/databinding-json/pom.xml
+++ b/branches/sca-equinox/modules/databinding-json/pom.xml
@@ -95,6 +95,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index 0910c3fb0a..dc6a72a772 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: commonj.sdo;version="2.1",
  commonj.sdo.impl;resolution:=optional,

  javax.xml.namespace,

  javax.xml.stream;version="1.0",

- junit.framework;resolution:=optional,

+ 

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

  org.apache.axiom.om.impl.serialize,

diff --git a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
index 10dcefda95..decc3332d2 100644
--- a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: commonj.sdo;version="2.1",
  javax.xml.stream,

  javax.xml.transform,

  javax.xml.transform.dom,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4.0",

  org.apache.tuscany.sca.contribution;version="1.4",

  org.apache.tuscany.sca.contribution.processor;version="1.4",

@@ -56,7 +56,7 @@ Import-Package: commonj.sdo;version="2.1",
  org.eclipse.emf.common.notify,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.util,

- org.junit;resolution:=optional,

+ 

  org.osoa.sca;version="1.4",

  org.w3c.dom,

  org.w3c.dom.bootstrap,

diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
index 7ec28531c0..a873498182 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
@@ -10,14 +10,18 @@ Bnd-LastModified: 1225397402000
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Data Binding for XmlBeans

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.databinding;version="1.4",org.apache.tuscany.sca.databinding.im

- pl;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",or

- g.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache.xmlbe

- ans,org.osoa.sca;version="1.4",org.osoa.sca.annotations;version="1.4"

- ,org.w3c.dom,org.apache.xmlbeans.impl.values;resolution:=optional,jun

- it.framework;resolution:=optional,org.apache.xmlbeans.xml.stream;reso

- lution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.xmlbeans,

+ org.apache.xmlbeans.impl.values;resolution:=optional,

+ org.apache.xmlbeans.xml.stream;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4",

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.xmlbeans

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
index 4de49902eb..44758bf472 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
+++ b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
@@ -56,6 +56,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
index ebb12dab8c..14592efd70 100644
--- a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
@@ -36,21 +36,31 @@ Bnd-LastModified: 1225397181875
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA DataBinding Framework

-Import-Package: javax.xml.datatype,javax.xml.namespace,javax.xml.parse

- rs,javax.xml.stream,javax.xml.stream.util,javax.xml.transform,javax.x

- ml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,o

- rg.apache.tuscany.sca.contribution.resolver;version="1.4",org.apache.

- tuscany.sca.databinding;version="1.4",org.apache.tuscany.sca.databind

- ing.annotation;version="1.4",org.apache.tuscany.sca.databinding.impl;

- version="1.4",org.apache.tuscany.sca.databinding.javabeans;version="1

- .4",org.apache.tuscany.sca.databinding.util;version="1.4",org.apache.

- tuscany.sca.databinding.xml;version="1.4",org.apache.tuscany.sca.exte

- nsibility;version="1.4",org.apache.tuscany.sca.interfacedef;version="

- 1.4",org.apache.tuscany.sca.interfacedef.impl;version="1.4",org.apach

- e.tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.

- xsd;version="1.4",org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax

- .helpers,org.custommonkey.xmlunit;resolution:=optional,org.junit;reso

- lution:=optional,junit.framework;resolution:=optional

+Import-Package: javax.xml.datatype,

+ javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.stream,

+ javax.xml.stream.util,

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ javax.xml.transform.sax,

+ javax.xml.transform.stream,

+ org.apache.tuscany.sca.contribution.resolver;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.javabeans;version="1.4",

+ org.apache.tuscany.sca.databinding.util;version="1.4",

+ org.apache.tuscany.sca.databinding.xml;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",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.w3c.dom,

+ org.xml.sax,

+ org.xml.sax.ext,

+ org.xml.sax.helpers

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
index f51d1d3fcf..23b8f26d8b 100644
--- a/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  ion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscan

  y.sca.definitions;version="1.4",org.apache.tuscany.sca.definitions.ut

  il;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apa

- che.tuscany.sca.policy;version="1.4",org.junit;resolution:=optional

+ che.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.definitions.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
index 584cfe1e35..36ada642c2 100644
--- a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Import-Package: javax.servlet,
  javax.xml.namespace,

  javax.xml.parsers,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.commons.fileupload,

  org.apache.commons.fileupload.disk,

  org.apache.commons.fileupload.servlet,

diff --git a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
index 38dacdc20c..4213af72ac 100644
--- a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
@@ -10,22 +10,22 @@ Bnd-LastModified: 1225397237968
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Default Endpoint Implementation

-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.endpointreso

- lver;version="1.4",org.osoa.sca.annotations;version="1.4";resolution:

- =optional,org.apache.tuscany.sca.assembly.builder.impl;resolution:=op

- tional,org.apache.tuscany.sca.definitions;version="1.4";resolution:=o

- ptional,org.apache.tuscany.sca.endpoint.impl;resolution:=optional,org

- .apache.tuscany.sca.contribution;version="1.4";resolution:=optional,o

- rg.apache.tuscany.sca.policy;version="1.4";resolution:=optional,org.a

- pache.tuscany.sca.monitor;version="1.4";resolution:=optional,org.juni

- t;resolution:=optional,org.apache.tuscany.sca.interfacedef;version="1

- .4";resolution:=optional,javax.xml.stream;resolution:=optional,junit.

- framework;resolution:=optional,org.apache.tuscany.sca.core.assembly;v

- ersion="1.4";resolution:=optional,org.apache.tuscany.sca.contribution

- .resolver;version="1.4";resolution:=optional,org.apache.tuscany.sca.c

- ontribution.processor;version="1.4";resolution:=optional,org.apache.t

- uscany.sca.assembly.builder;version="1.4";resolution:=optional

+Import-Package: javax.xml.stream;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.assembly.builder.impl;resolution:=optional,

+ org.apache.tuscany.sca.contribution;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.contribution.processor;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.contribution.resolver;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.endpoint.impl;resolution:=optional,

+ org.apache.tuscany.sca.endpointresolver;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.monitor;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.endpoint

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
index 271dbbad9c..d054b26acb 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
@@ -16,10 +16,9 @@ Bundle-ManifestVersion: 2
 Bundle-Description: Apache Tuscany SCA Extensibility for Eclipse Equin

  ox

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Import-Package: org.apache.tuscany.sca.extensibility;version="1.4",org

- .osgi.framework;version="1.4",junit.framework;resolution:=optional,or

- g.junit;resolution:=optional,org.eclipse.core.runtime.adaptor;resolut

- ion:=optional

+Import-Package: org.apache.tuscany.sca.extensibility;version="1.4",

+ org.eclipse.core.runtime.adaptor;resolution:=optional,

+ org.osgi.framework;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility.equinox

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
index fecd405b79..2cca0f0936 100644
--- a/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
@@ -12,9 +12,8 @@ Bnd-LastModified: 1225397079296
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Extensibility

-Import-Package: org.apache.tuscany.sca.core;version="1.4",org.apache.t

- uscany.sca.extensibility;version="1.4",junit.framework;resolution:=op

- tional,org.junit;resolution:=optional

+Import-Package: org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
index 580b3e5499..fa8ae15c83 100644
--- a/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
@@ -9,13 +9,15 @@ Bnd-LastModified: 1225397427890
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA JEE environment CORBA Host

-Import-Package: javax.naming,javax.rmi,org.apache.tuscany.sca.core;ver

- sion="1.4",org.apache.tuscany.sca.host.corba;version="1.4",org.omg.CO

- RBA,org.omg.CosNaming,org.omg.CosNaming.NamingContextPackage,junit.fr

- amework;resolution:=optional,org.apache.tuscany.sca.host.corba.jee;re

- solution:=optional,org.apache.tuscany.sca.host.corba.naming;resolutio

- n:=optional,org.omg.CORBA.portable;resolution:=optional,javax.naming.

- spi;resolution:=optional,org.junit;resolution:=optional

+Import-Package: javax.naming,

+ javax.naming.spi;resolution:=optional,

+ javax.rmi,

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.corba;version="1.4",

+ org.omg.CORBA,

+ org.omg.CORBA.portable;resolution:=optional,

+ org.omg.CosNaming,

+ org.omg.CosNaming.NamingContextPackage

 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jee

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
index fb71a63a38..c0071d929f 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
@@ -11,13 +11,11 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Transient Name Server CORBA Hos

  t

-Import-Package: org.apache.tuscany.sca.core;version="1.4",org.apache.t

- uscany.sca.host.corba;version="1.4",org.apache.tuscany.sca.host.corba

- .jse;version="1.4",org.apache.tuscany.sca.host.corba.naming;version="

- 1.4",org.omg.CORBA,org.apache.tuscany.sca.binding.corba.provider.serv

- ice;resolution:=optional,org.apache.tuscany.sca.host.corba.jse.tns;re

- solution:=optional,junit.framework;resolution:=optional,org.junit;res

- olution:=optional

+Import-Package: org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.corba;version="1.4",

+ org.apache.tuscany.sca.host.corba.jse;version="1.4",

+ org.apache.tuscany.sca.host.corba.naming;version="1.4",

+ org.omg.CORBA

 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse.tns

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
index 4b941d32ce..26d0f037e8 100644
--- a/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
@@ -19,8 +19,8 @@ Import-Package: org.apache.tuscany.sca.core;version="1.4",org.apache.t
  .jse;version="1.4",org.apache.tuscany.sca.host.corba.naming;version="

  1.4",org.omg.CORBA,org.omg.CosNaming,org.omg.CosNaming.NamingContextE

  xtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.PortableServ

- er,junit.framework;resolution:=optional,org.omg.CORBA.portable;resolu

- tion:=optional,org.junit;resolution:=optional

+ er,org.omg.CORBA.portable;resolu

+ tion:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
index f4846d0d70..8e0abcaa22 100644
--- a/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA CORBA Host Extension Point

 Import-Package: org.apache.tuscany.sca.host.corba;version="1.4",org.om

- g.CORBA,org.junit;resolution:=optional

+ g.CORBA

 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
index 3d3175d1b2..971164f399 100644
--- a/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-Description: Apache Tuscany SCA Jetty Servlet Host Extension
 Import-Package: javax.net.ssl;resolution:=optional,

  javax.servlet,

  javax.servlet.http;resolution:=optional,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.host.http;version="1.4",

  org.apache.tuscany.sca.work;version="1.4",

diff --git a/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
index 3d39c888d1..e85017a67f 100644
--- a/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bnd-LastModified: 1225397321468
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA RMI Host Extension Point

-Import-Package: org.apache.tuscany.sca.host.rmi;version="1.4",junit.fr

- amework;resolution:=optional

+Import-Package: org.apache.tuscany.sca.host.rmi;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.host.rmi

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index e5ffcdcb8b..e2842f488c 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: javax.resource.spi,
  javax.transaction;version="1.0.1",

  javax.wsdl,

  javax.xml.namespace,

- junit.framework;resolution:=optional,

+ 

  org.apache.commons.logging,

  org.apache.geronimo.transaction.manager,

  org.apache.ode.bpel.compiler,

diff --git a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
index 9be3a3a7b6..f18b080901 100644
--- a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: javax.wsdl,
  javax.wsdl.extensions,

  javax.xml.namespace,

  javax.xml.stream,

- 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.contribution.processor;version="1.4",

diff --git a/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
index 71fbee9b7d..3aff9309c7 100644
--- a/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  n:=optional,org.apache.tuscany.sca.definitions;version="1.4";resoluti

  on:=optional,org.apache.tuscany.sca.policy;version="1.4";resolution:=

  optional,org.apache.tuscany.sca.interfacedef;version="1.4";resolution

- :=optional,junit.framework;resolution:=optional,org.apache.tuscany.sc

+ :=optional,org.apache.tuscany.sc

  a.assembly.builder;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.ejb

 Bundle-DocURL: http://www.apache.org/

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",

diff --git a/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
index 5d6d00c7d6..8c1d6f198f 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc
  "1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tusc

  any.sca.node;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",junit.framework;resolution:=optional

+ ="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node.runtim

  e

 Bundle-DocURL: http://www.apache.org/

diff --git a/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
index aefef7257f..2ac3da8c1d 100644
--- a/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
@@ -14,19 +14,23 @@ Bnd-LastModified: 1225397193593
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node Implementation Model

-Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream

- ,javax.xml.transform,org.apache.tuscany.sca.assembly;version="1.4",or

- g.apache.tuscany.sca.assembly.builder;version="1.4",org.apache.tuscan

- y.sca.contribution;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.tu

- scany.sca.definitions;version="1.4",org.apache.tuscany.sca.implementa

- tion.node;version="1.4",org.apache.tuscany.sca.interfacedef;version="

- 1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.tuscany.

- sca.assembly.builder.impl;resolution:=optional,org.apache.tuscany.sca

- .implementation.node.impl;resolution:=optional,org.apache.tuscany.sca

- .policy;version="1.4";resolution:=optional,junit.framework;resolution

- :=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.stream,

+ javax.xml.transform,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.assembly.builder.impl;resolution:=optional,

+ org.apache.tuscany.sca.contribution;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.definitions;version="1.4",

+ org.apache.tuscany.sca.implementation.node;version="1.4",

+ org.apache.tuscany.sca.implementation.node.impl;resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
index 0fe2f33ab0..24f187b921 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
@@ -10,14 +10,13 @@ Bnd-LastModified: 1225397274609
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Resource Implementation Runtime

-Import-Package: junit.framework;resolution:=optional,

+Import-Package: 

  org.apache.tuscany.sca.assembly;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.data.collection;version="1.4.0",

  org.apache.tuscany.sca.implementation.resource;version="1.4",

  org.apache.tuscany.sca.interfacedef;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  org.apache.tuscany.sca.provider;version="1.4",

  org.apache.tuscany.sca.runtime;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource.ru

diff --git a/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
index 3218bf0336..e08aeb7a56 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Bundle-Description: Apache Tuscany SCA Script Implementation Extension
 Import-Package: com.sun.script.jruby,

  javax.script,

  javax.xml.namespace,

- junit.framework;resolution:=optional,

  org.apache.axiom.om,

  org.apache.bsf.xml,

  org.apache.tuscany.sca.assembly;version="1.4",

@@ -37,7 +36,6 @@ Import-Package: com.sun.script.jruby,
  org.apache.tuscany.sca.interfacedef.util;version="1.4.0",

  org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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",

diff --git a/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
index 9c8fa66211..240deaee25 100644
--- a/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
@@ -31,7 +31,6 @@ Bundle-Description: Apache Tuscany SCA Spring Framework Implementation
   Extension

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- 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.assembly.xml;version="1.4",

@@ -51,7 +50,6 @@ Import-Package: javax.xml.namespace,
  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.node;resolution:=optional,

  org.apache.tuscany.sca.policy;version="1.4",

  org.apache.tuscany.sca.provider;version="1.4",

  org.apache.tuscany.sca.runtime;version="1.4",

diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index f58a160d87..3e296842bd 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
@@ -10,17 +10,12 @@ Bnd-LastModified: 1225397415984
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Widget Implementation Runtime

-Import-Package: junit.framework;resolution:=optional,

- org.apache.abdera;resolution:=optional,

- org.apache.abdera.factory;resolution:=optional,

- org.apache.abdera.model;resolution:=optional,

+Import-Package: 

  org.apache.tuscany.sca.assembly;version="1.4",

- org.apache.tuscany.sca.binding.atom.collection;resolution:=optional,

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.implementation.widget;version="1.4",

  org.apache.tuscany.sca.interfacedef;version="1.4",

  org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.node;resolution:=optional,

  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",

diff --git a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index a6ae66ea58..6378fdb1ee 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Import-Package: javax.jws,
  javax.xml.transform;resolution:=optional,

  javax.xml.transform.stream;resolution:=optional,

  javax.xml.ws,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4.0",

  org.apache.tuscany.sca.databinding;version="1.4",

  org.apache.tuscany.sca.databinding.annotation;version="1.4",

@@ -40,7 +40,7 @@ Import-Package: javax.jws,
  org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",

  org.apache.tuscany.sca.interfacedef.util;version="1.4",

  org.apache.tuscany.sca.policy;version="1.4.0",

- org.junit;resolution:=optional,

+ 

  org.objectweb.asm;version="3.1",

  org.objectweb.asm.util;version="3.1";resolution:=optional,

  org.osoa.sca;version="1.4",

diff --git a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
index 1c8360ca0e..806a7730dc 100644
--- a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Import-Package: javax.xml.namespace,
  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.0",

- org.junit;resolution:=optional

+ org.apache.tuscany.sca.policy;version="1.4.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
index 358bf00869..a2f58302b3 100644
--- a/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
@@ -21,16 +21,18 @@ Bnd-LastModified: 1225397130359
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Java Interface Model

-Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve

- rsion="1.4",org.apache.tuscany.sca.core;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.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.s

- ca.interfacedef.java.introspect;version="1.4",org.apache.tuscany.sca.

- interfacedef.util;version="1.4",org.apache.tuscany.sca.policy;version

- ="1.4",org.osoa.sca.annotations;version="1.4",junit.framework;resolut

- ion:=optional

+Import-Package: javax.xml.namespace,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.core;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",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
index b2a155183c..e4e7ad08cb 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: javax.wsdl,
  javax.wsdl.xml,

  javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4";resolution:=optional,

  org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,

  org.apache.tuscany.sca.contribution;version="1.4",

@@ -33,7 +33,7 @@ Import-Package: javax.wsdl,
  org.apache.tuscany.sca.xsd;version="1.4",

  org.apache.tuscany.sca.xsd.xml;version="1.4",

  org.apache.ws.commons.schema,

- org.junit;resolution:=optional,

+ 

  org.w3c.dom,

  org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl.xml

diff --git a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
index a81cf445c1..0719e71d94 100644
--- a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Bundle-Description: Apache Tuscany SCA WSDL Interface Model
 Import-Package: javax.wsdl,

  javax.wsdl.extensions,

  javax.xml.namespace,

- junit.framework;resolution:=optional,

  org.apache.tuscany.sca.assembly;version="1.4",

  org.apache.tuscany.sca.contribution;version="1.4.0";resolution:=optional,

  org.apache.tuscany.sca.contribution.processor;version="1.4.0";resolution:=optional,

@@ -31,8 +30,7 @@ Import-Package: javax.wsdl,
  org.apache.tuscany.sca.monitor;version="1.4.0";resolution:=optional,

  org.apache.tuscany.sca.policy;version="1.4",

  org.apache.tuscany.sca.xsd;version="1.4",

- org.apache.ws.commons.schema,

- org.junit;resolution:=optional

+ org.apache.ws.commons.schema

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
index 9f2f1ed59c..50d1eb711a 100644
--- a/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Import-Package: javax.xml.datatype,javax.xml.namespace,javax.xml.trans
  form,org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tus

  cany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca.inter

  facedef.util;version="1.4",org.apache.tuscany.sca.policy;version="1.4

- ",junit.framework;resolution:=optional,org.apache.tuscany.sca.core;ve

- rsion="1.4";resolution:=optional,org.junit;resolution:=optional

+ ",org.apache.tuscany.sca.core;ve

+ rsion="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
index 19a6b00a2d..131bbcaf52 100644
--- a/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Bnd-LastModified: 1225397090921
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Monitor

-Import-Package: org.apache.tuscany.sca.monitor;version="1.4",org.junit

- ;resolution:=optional

+Import-Package: org.apache.tuscany.sca.monitor;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.monitor

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
index 2a45bd9c7c..0391a04003 100644
--- a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Node Implementation

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4",

  org.apache.tuscany.sca.assembly.builder;version="1.4",

  org.apache.tuscany.sca.contribution;version="1.4",

@@ -40,7 +40,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.work;version="1.4",

  org.apache.tuscany.sca.workspace;version="1.4",

  org.apache.tuscany.sca.workspace.builder;version="1.4",

- org.junit;resolution:=optional,

+ 

  org.osoa.sca;version="1.4",

  org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl

diff --git a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 810457b8b5..37d3c72d1b 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
@@ -11,11 +11,9 @@ Bnd-LastModified: 1225397473703
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node Equinox OSGi Launcher

-Import-Package: org.apache.tuscany.sca.node.equinox.launcher;version="

- 1.4",org.eclipse.core.runtime.adaptor,org.osgi.framework;version="1.4

- ",org.osoa.sca.annotations;resolution:=optional,junit.framework;resol

- ution:=optional,org.apache.tuscany.sca.node;resolution:=optional,org.

- junit;resolution:=optional

+Import-Package: org.apache.tuscany.sca.node.equinox.launcher;version="1.4",

+ org.eclipse.core.runtime.adaptor,

+ org.osgi.framework;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.node.launcher.equinox

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
index 4e9d422695..0bead60d14 100644
--- a/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
@@ -10,16 +10,19 @@ Bnd-LastModified: 1225397480671
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany Logging Policy Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution.proc

- essor;version="1.4",org.apache.tuscany.sca.contribution.resolver;vers

- ion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscan

- y.sca.definitions;version="1.4",org.apache.tuscany.sca.interfacedef;v

- ersion="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apac

- he.tuscany.sca.monitor;version="1.4",org.apache.tuscany.sca.policy;ve

- rsion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.

- tuscany.sca.runtime;version="1.4",junit.framework;resolution:=optiona

- l

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;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.definitions;version="1.4",

+ org.apache.tuscany.sca.interfacedef;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",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.logging

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
index 9c1010e56c..0ac36efa2a 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Import-Package: javax.annotation.security,javax.xml.namespace,org.apac
  impl;resolution:=optional,org.osoa.sca.annotations;version="1.4";reso

  lution:=optional,org.apache.tuscany.sca.interfacedef.java;version="1.

  4";resolution:=optional,org.apache.tuscany.sca.interfacedef;version="

- 1.4";resolution:=optional,junit.framework;resolution:=optional,org.ap

+ 1.4";resolution:=optional,org.ap

  ache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=opt

  ional

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.jsr250

diff --git a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
index f1b52c5586..85796bc6d5 100644
--- a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
@@ -17,18 +17,25 @@ Bnd-LastModified: 1225397300062
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany Security Policy WS Model

-Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver

- sion="1.0",org.apache.axiom.om,org.apache.axis2,org.apache.axis2.cont

- ext,org.apache.axis2.description,org.apache.axis2.engine,org.apache.n

- eethi,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscan

- y.sca.contribution.processor;version="1.4",org.apache.tuscany.sca.con

- tribution.resolver;version="1.4",org.apache.tuscany.sca.core;version=

- "1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.tuscany

- .sca.policy;version="1.4",org.apache.tuscany.sca.policy.security.ws;v

- ersion="1.4",org.apache.tuscany.sca.policy.util;version="1.4",org.apa

- che.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime

- ;version="1.4",org.osoa.sca;version="1.4",junit.framework;resolution:

- =optional

+Import-Package: javax.xml.namespace;version="1.0",

+ javax.xml.stream;version="1.0",

+ org.apache.axiom.om,

+ org.apache.axis2,

+ org.apache.axis2.context,

+ org.apache.axis2.description,

+ org.apache.axis2.engine,

+ org.apache.neethi,

+ org.apache.tuscany.sca.assembly;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.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.security.ws;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"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.ws

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
index a3d2827c93..7fa44bee8c 100644
--- a/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
@@ -35,23 +35,29 @@ Bnd-LastModified: 1225397295515
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany Security Policy Model

-Import-Package: javax.security.auth.callback,javax.security.auth.login

- ,javax.xml.namespace,javax.xml.stream,org.apache.tuscany.sca.assembly

- ;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.definiti

- ons;version="1.4",org.apache.tuscany.sca.definitions.util;version="1.

- 4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tusca

- ny.sca.invocation;version="1.4",org.apache.tuscany.sca.monitor;versio

- n="1.4",org.apache.tuscany.sca.policy;version="1.4",org.apache.tuscan

- y.sca.policy.authentication.basic;version="1.4",org.apache.tuscany.sc

- a.policy.authorization;version="1.4",org.apache.tuscany.sca.policy.id

- entity;version="1.4",org.apache.tuscany.sca.policy.security;version="

- 1.4",org.apache.tuscany.sca.policy.security.jaas;version="1.4",org.ap

- ache.tuscany.sca.policy.util;version="1.4",org.apache.tuscany.sca.pro

- vider;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.

- osoa.sca;version="1.4",junit.framework;resolution:=optional,org.junit

- ;resolution:=optional

+Import-Package: javax.security.auth.callback,

+ javax.security.auth.login,

+ javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;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.definitions;version="1.4",

+ org.apache.tuscany.sca.definitions.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef;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",

+ org.apache.tuscany.sca.policy.authentication.basic;version="1.4",

+ org.apache.tuscany.sca.policy.authorization;version="1.4",

+ org.apache.tuscany.sca.policy.identity;version="1.4",

+ org.apache.tuscany.sca.policy.security;version="1.4",

+ org.apache.tuscany.sca.policy.security.jaas;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"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
index f2d58f098c..c847400657 100644
--- a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Import-Package: javax.resource.spi,
  javax.transaction.xa;version="1.1";resolution:=optional,

  javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.geronimo.transaction.log,

  org.apache.geronimo.transaction.manager,

  org.apache.tuscany.sca.assembly;version="1.4",

diff --git a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
index f9bc4eaa4b..4545d9a2a2 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
@@ -9,13 +9,16 @@ Bnd-LastModified: 1225397120421
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Policy XML WS Model

-Import-Package: javax.xml.namespace,javax.xml.stream;version="1.0",org

- .apache.axiom.om,org.apache.neethi,org.apache.tuscany.sca.contributio

- n.processor;version="1.4",org.apache.tuscany.sca.contribution.resolve

- r;version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.

- tuscany.sca.monitor;version="1.4",org.apache.tuscany.sca.policy.xml;v

- ersion="1.4";resolution:=optional,junit.framework;resolution:=optiona

- l,org.apache.tuscany.sca.policy;version="1.4";resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream;version="1.0",

+ org.apache.axiom.om,

+ org.apache.neethi,

+ 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.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.policy.xml;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml.ws

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
index 0e2c35de0e..7bb16d73d9 100644
--- a/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.xpath,o
  .tuscany.sca.contribution.resolver;version="1.4",org.apache.tuscany.s

  ca.core;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",or

  g.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.poli

- cy.impl;version="1.4",junit.framework;resolution:=optional

+ cy.impl;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
index 8f86503a09..1edbc88f0b 100644
--- a/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
@@ -16,12 +16,17 @@ Bnd-LastModified: 1225397083703
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Policy Model

-Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.transf

- orm,javax.xml.transform.dom,javax.xml.transform.stream,javax.xml.xpat

- h,org.apache.tuscany.sca.extensibility;version="1.4",org.apache.tusca

- ny.sca.policy;version="1.4",org.apache.tuscany.sca.policy.impl;versio

- n="1.4",org.apache.tuscany.sca.policy.util;version="1.4",org.w3c.dom,

- junit.framework;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ javax.xml.transform.stream,

+ javax.xml.xpath,

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.impl;version="1.4",

+ org.apache.tuscany.sca.policy.util;version="1.4",

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.policy

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
index 768d4f7228..061d0ad3e7 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Bundle-Description: The Apache Software Foundation provides support fo
     We consider ourselves not simply a group of projects sharing a ser

  ver, but rather a community of developers    and users.

 Import-Package: org.aspectj.lang,org.aspectj.lang.annotation,org.aspec

- tj.lang.reflect,org.junit;resolution:=optional

+ tj.lang.reflect

 Bundle-SymbolicName: org.apache.tuscany.sca.tracing.aspect

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
index e3e2db3715..f4b41fe87d 100644
--- a/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
@@ -11,16 +11,16 @@ Bnd-LastModified: 1225397201562
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Domain Workspace Implementation

-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.contribution;version="1.4",org.apache.tuscany.sca.cont

- ribution.processor;version="1.4",org.apache.tuscany.sca.contribution.

- resolver;version="1.4",org.apache.tuscany.sca.contribution.scanner;ve

- rsion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tusc

- any.sca.monitor;version="1.4",org.apache.tuscany.sca.workspace;versio

- n="1.4",org.apache.tuscany.sca.workspace.builder;version="1.4",junit.

- framework;resolution:=optional,org.apache.tuscany.sca.contribution.na

- mespace.impl;resolution:=optional,org.apache.tuscany.sca.contribution

- .namespace;resolution:=optional

+Import-Package: 

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution;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.contribution.scanner;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.workspace;version="1.4",

+ org.apache.tuscany.sca.workspace.builder;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.impl

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
index dea71c40a5..cb5af2f786 100644
--- a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
@@ -17,8 +17,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.contribution.resolver;version="1.4",

  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.monitor;version="1.4",

- org.apache.tuscany.sca.workspace;version="1.4",

- org.junit;resolution:=optional

+ org.apache.tuscany.sca.workspace;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
index 73d6bfbe99..0453a2ce74 100644
--- a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA XSD XML Processor

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- junit.framework;resolution:=optional,

+ 

  org.apache.tuscany.sca.assembly;version="1.4.0",

  org.apache.tuscany.sca.contribution;version="1.4",

  org.apache.tuscany.sca.contribution.namespace;version="1.4",

@@ -29,7 +29,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.xsd.xml;version="1.4",

  org.apache.ws.commons.schema,

  org.apache.ws.commons.schema.resolver,

- org.junit;resolution:=optional,

+ 

  org.w3c.dom,

  org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.xsd.xml