Fix the MANIFEST.MF to add optional packages for test cases in Import-Package

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709237 13f79535-47bb-0310-9956-ffa450edef68
author: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> 2008-10-30 20:27:32 +0000
committer: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> 2008-10-30 20:27:32 +0000
commit: 81014f70174926903e10cbcba3ad657494f9bce0 (patch)
tree: f2921c56f74c984010c69e7601cccb934dc454c8 /branches
parent: bfe094c6cd1cff5182683b9b0d1e6f6033e57da3 (diff)
106 files changed, 1938 insertions, 1753 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 e1cb7d00c7..003ddfea4d 100644
--- a/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
@@ -1,6 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.assembly.xml;uses:="org.apache.
+ tuscany.sca.definitions,javax.xml.transform.dom,org.apache.tuscany.sc
+ a.core,org.apache.tuscany.sca.policy,javax.xml.namespace,org.apache.t
+ uscany.sca.contribution.java,javax.xml.stream,org.apache.tuscany.sca.
+ contribution.resolver,org.apache.tuscany.sca.policy.util,org.apache.t
+ uscany.sca.assembly,javax.xml.parsers,org.apache.tuscany.sca.contribu
+ tion,org.apache.tuscany.sca.monitor,org.w3c.dom,org.apache.tuscany.sc
+ a.interfacedef,org.apache.tuscany.sca.contribution.namespace,javax.xm
+ l.xpath,javax.xml.transform,org.apache.tuscany.sca.contribution.proce
+ ssor,org.apache.tuscany.sca.interfacedef.impl";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA XML Assembly Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397124328
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA XML Assembly Model
 Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream
  ,javax.xml.transform,javax.xml.transform.dom,javax.xml.xpath,org.apac
  he.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly
@@ -13,24 +30,10 @@ 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
-Bnd-LastModified: 1225317028028
-Export-Package: org.apache.tuscany.sca.assembly.xml;uses:="org.apache.
- tuscany.sca.monitor,javax.xml.namespace,org.apache.tuscany.sca.contri
- bution.resolver,org.apache.tuscany.sca.contribution,javax.xml.transfo
- rm,javax.xml.parsers,org.apache.tuscany.sca.assembly,org.apache.tusca
- ny.sca.definitions,org.apache.tuscany.sca.contribution.java,org.apach
- e.tuscany.sca.contribution.namespace,javax.xml.stream,org.apache.tusc
- any.sca.interfacedef.impl,org.w3c.dom,org.apache.tuscany.sca.policy,j
- avax.xml.xpath,org.apache.tuscany.sca.contribution.processor,javax.xm
- l.transform.dom,org.apache.tuscany.sca.interfacedef,org.apache.tuscan
- y.sca.core,org.apache.tuscany.sca.policy.util";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA XML Assembly Model
-Bundle-Name: Apache Tuscany SCA XML Assembly Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ l;version="1.4",org.w3c.dom,org.junit;resolution:=optional,org.xml.sa
+ x;resolution:=optional,junit.framework;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
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
index b6a5a96ca1..3fde8bc9bb 100644
--- a/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas
+Bnd-LastModified: 1225397088359
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
 Bundle-Description: Apache Tuscany SCA Assembly Model XML Schemas
-Bundle-DocURL: http://www.apache.org/
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ManifestVersion: 2
+Bundle-DocURL: http://www.apache.org/
 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd
-Tool: Bnd-0.0.255
-Bnd-LastModified: 1225316999810
-Bundle-Version: 1.4
 
diff --git a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
index d680231d4c..fd94542249 100644
--- a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
@@ -1,48 +1,37 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.assembly;uses:="javax.xml.xpath
+ ,org.apache.tuscany.sca.assembly.impl,org.apache.tuscany.sca.policy,o
+ rg.apache.tuscany.sca.interfacedef,javax.xml.namespace";version="1.4"
+ ,org.apache.tuscany.sca.assembly.impl;uses:="javax.xml.xpath,org.apac
+ he.tuscany.sca.assembly,org.apache.tuscany.sca.policy,org.apache.tusc
+ any.sca.interfacedef,javax.xml.namespace";version="1.4",org.apache.tu
+ scany.sca.assembly.builder;uses:="org.apache.tuscany.sca.assembly,org
+ .apache.tuscany.sca.definitions,org.apache.tuscany.sca.core,org.apach
+ e.tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.apache.
+ tuscany.sca.extensibility";version="1.4"
+Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=
+ "1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Assembly Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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.0.SNAPSHOT",org.apache.tu
- scany.sca.assembly.builder;version="1.4.0.SNAPSHOT",org.apache.tuscan
- y.sca.assembly.builder.impl;version="1.4.0.SNAPSHOT",org.apache.tusca
- ny.sca.assembly.impl;version="1.4.0.SNAPSHOT",org.apache.tuscany.sca.
- core;version="1.4",org.apache.tuscany.sca.definitions;version="1.4",o
- rg.apache.tuscany.sca.extensibility;version="1.4",org.apache.tuscany.
- sca.interfacedef;version="1.4",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
-Bnd-LastModified: 1225350093047
-Export-Package: org.apache.tuscany.sca.assembly.builder;uses:="org.apa
- che.tuscany.sca.extensibility,org.apache.tuscany.sca.monitor,org.apac
- he.tuscany.sca.interfacedef,org.apache.tuscany.sca.assembly.builder.i
- mpl,org.apache.tuscany.sca.core,org.apache.tuscany.sca.definitions,or
- g.apache.tuscany.sca.assembly";version="1.4.0.SNAPSHOT",org.apache.tu
- scany.sca.assembly.builder.impl;uses:="org.apache.tuscany.sca.monitor
- ,javax.xml.namespace,javax.xml.transform,javax.xml.parsers,org.apache
- .tuscany.sca.definitions,org.apache.tuscany.sca.assembly,org.xml.sax,
- org.w3c.dom,org.apache.tuscany.sca.policy,javax.xml.xpath,javax.xml.t
- ransform.dom,org.apache.tuscany.sca.assembly.builder,javax.xml.transf
- orm.sax,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.co
- re,org.apache.tuscany.sca.policy.util";version="1.4.0.SNAPSHOT",org.a
- pache.tuscany.sca.assembly;uses:="javax.xml.namespace,org.apache.tusc
- any.sca.interfacedef,org.apache.tuscany.sca.assembly.impl,javax.xml.x
- path,org.apache.tuscany.sca.policy";version="1.4.0.SNAPSHOT",org.apac
- he.tuscany.sca.assembly.impl;uses:="javax.xml.namespace,org.apache.tu
- scany.sca.interfacedef,org.apache.tuscany.sca.assembly,javax.xml.xpat
- h,org.apache.tuscany.sca.policy";version="1.4.0.SNAPSHOT"
-Bundle-Version: 1.4.0.SNAPSHOT
-Bundle-Description: The Apache Software Foundation provides support fo
- r the Apache community of open-source software projects.    The Apach
- e projects are characterized by a collaborative, consensus based deve
- lopment process, an open and    pragmatic software license, and a des
- ire to create high quality software that leads the way in its field. 
-    We consider ourselves not simply a group of projects sharing a ser
- ver, but rather a community of developers    and users.
-Bundle-Name: Apache Tuscany SCA Assembly Model
+ 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
+Bundle-SymbolicName: org.apache.tuscany.sca.assembly
 Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-SymbolicName: org.apache.tuscany.sca.tuscany-assembly
-Tool: Bnd-0.0.255
 
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 942cd83a95..136c0af34f 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
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.atom.collection;uses:="
+ org.osoa.sca.annotations,org.apache.abdera.model";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.atom.provider;version=
+ "1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397264250
+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: javax.servlet,javax.servlet.http,javax.xml.namespace,o
  rg.apache.abdera,org.apache.abdera.factory,org.apache.abdera.i18n.iri
  ,org.apache.abdera.model,org.apache.abdera.parser,org.apache.abdera.w
@@ -18,18 +29,12 @@ Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,o
  nterfacedef.util;version="1.4",org.apache.tuscany.sca.invocation;vers
  ion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.tu
  scany.sca.runtime;version="1.4",org.osoa.sca;version="1.4",org.osoa.s
- ca.annotations;version="1.4"
-Bnd-LastModified: 1225317130729
-Export-Package: org.apache.tuscany.sca.binding.atom.collection;uses:="
- org.apache.abdera.model,org.osoa.sca.annotations";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension
-Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.atom.provider;version=
- "1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ca.annotations;version="1.4",org.apache.abdera.protocol.client.util;r
+ esolution:=optional,org.apache.abdera.protocol.client;resolution:=opt
+ ional,org.apache.abdera.protocol;resolution:=optional,org.apache.tusc
+ any.sca.node;resolution:=optional,org.junit;resolution:=optional,java
+ x.activation;version="1.1";resolution:=optional,junit.framework;resol
+ ution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 45bdf5a2c2..f6520656ab 100644
--- a/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
@@ -1,20 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-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"
-Bnd-LastModified: 1225317123510
 Export-Package: org.apache.tuscany.sca.binding.atom;uses:="org.apache.
  tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension
-Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension
 Private-Package: org.apache.tuscany.sca.binding.atom.impl;version="1.4
  "
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom
-Tool: Bnd-0.0.255
+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 cd37447b96..d9cecc82a2 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
@@ -1,6 +1,37 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.corba.provider.service;
+ uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.binding.
+ corba.provider.exceptions,org.omg.CORBA,org.omg.CORBA.portable,org.ap
+ ache.tuscany.sca.interfacedef,org.apache.tuscany.sca.binding.corba.pr
+ ovider.types";version="1.4",org.apache.tuscany.sca.binding.corba.prov
+ ider;uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.ass
+ embly,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.binding.
+ corba.provider.exceptions,org.omg.CORBA,org.apache.tuscany.sca.core,o
+ rg.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.bindin
+ g.corba,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.bi
+ nding.corba.provider.reference,org.apache.tuscany.sca.invocation,org.
+ apache.tuscany.sca.binding.corba.provider.service,org.apache.tuscany.
+ sca.host.corba,org.osoa.sca";version="1.4",org.apache.tuscany.sca.bin
+ ding.corba.provider.exceptions;version="1.4",org.apache.tuscany.sca.b
+ inding.corba.provider.types;uses:="org.apache.tuscany.sca.binding.cor
+ ba.provider.exceptions";version="1.4",org.apache.tuscany.sca.binding.
+ corba.provider.reference;uses:="net.sf.cglib.proxy,org.apache.tuscany
+ .sca.binding.corba.provider.exceptions,org.omg.CORBA,org.apache.tusca
+ ny.sca.binding.corba.provider.types,org.omg.CORBA.portable";version="
+ 1.4"
+Private-Package: org.apache.tuscany.sca.binding.corba.provider.meta;ve
+ rsion="1.4",org.apache.tuscany.sca.binding.corba.provider.types.util;
+ version="1.4",org.apache.tuscany.sca.binding.corba.provider.util;vers
+ ion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA CORBA Binding Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -13,38 +44,15 @@ Import-Package: net.sf.cglib.proxy,org.apache.tuscany.sca.assembly;ver
  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"
-Bnd-LastModified: 1225317039700
-Export-Package: org.apache.tuscany.sca.binding.corba.provider.referenc
- e;uses:="org.apache.tuscany.sca.binding.corba.provider.exceptions,net
- .sf.cglib.proxy,org.omg.CORBA.portable,org.omg.CORBA,org.apache.tusca
- ny.sca.binding.corba.provider.types";version="1.4",org.apache.tuscany
- .sca.binding.corba.provider.exceptions;version="1.4",org.apache.tusca
- ny.sca.binding.corba.provider.service;uses:="org.omg.CORBA.portable,o
- rg.omg.CORBA,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.bi
- nding.corba.provider.exceptions,org.apache.tuscany.sca.interfacedef,o
- rg.apache.tuscany.sca.binding.corba.provider.types";version="1.4",org
- .apache.tuscany.sca.binding.corba.provider;uses:="org.apache.tuscany.
- sca.invocation,org.omg.CORBA,org.apache.tuscany.sca.runtime,org.apach
- e.tuscany.sca.host.corba,org.apache.tuscany.sca.binding.corba.provide
- r.reference,org.apache.tuscany.sca.binding.corba.provider.exceptions,
- org.apache.tuscany.sca.provider,org.apache.tuscany.sca.binding.corba.
- provider.service,org.osoa.sca,org.apache.tuscany.sca.interfacedef,org
- .apache.tuscany.sca.core,org.apache.tuscany.sca.binding.corba,org.apa
- che.tuscany.sca.assembly,org.apache.tuscany.sca.interfacedef.java";ve
- rsion="1.4",org.apache.tuscany.sca.binding.corba.provider.types;uses:
- ="org.apache.tuscany.sca.binding.corba.provider.exceptions";version="
- 1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA CORBA Binding Runtime
-Bundle-Description: Apache Tuscany SCA CORBA Binding Runtime
-Private-Package: org.apache.tuscany.sca.binding.corba.provider.meta;ve
- rsion="1.4",org.apache.tuscany.sca.binding.corba.provider.types.util;
- version="1.4",org.apache.tuscany.sca.binding.corba.provider.util;vers
- ion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
index 8cd01e6c43..7f790504e8 100644
--- a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.corba;uses:="org.apache
+ .tuscany.sca.assembly,javax.xml.namespace";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.corba.impl;version="1.
+ 4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA CORBA Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397128062
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA CORBA Binding Extension
 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.binding.corba;version="1.4",org.apac
@@ -8,17 +19,6 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core
  ;version="1.4",org.apache.tuscany.sca.host.corba;version="1.4",org.ap
  ache.tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317031293
-Export-Package: org.apache.tuscany.sca.binding.corba;uses:="javax.xml.
- namespace,org.apache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA CORBA Binding Extension
-Bundle-Description: Apache Tuscany SCA CORBA Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.corba.impl;version="1.
- 4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba
-Tool: Bnd-0.0.255
+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 54b4f49ba5..3c6bdf6093 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
@@ -1,6 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.ejb.corba;version="1.4
+ ",org.apache.tuscany.sca.binding.ejb.provider;version="1.4",org.apach
+ e.tuscany.sca.binding.ejb.util;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA EJB Binding Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397250828
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA EJB Binding Runtime
 Import-Package: javax.ejb,javax.ejb.spi,javax.naming,javax.rmi,javax.r
  mi.CORBA,net.sf.cglib.core,net.sf.cglib.proxy,org.apache.tuscany.sca.
  assembly;version="1.4",org.apache.tuscany.sca.binding.ejb;version="1.
@@ -10,17 +20,9 @@ Import-Package: javax.ejb,javax.ejb.spi,javax.naming,javax.rmi,javax.r
  e.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;v
  ersion="1.4",org.omg.CORBA,org.omg.CORBA.portable,org.omg.CORBA_2_3.p
  ortable,org.omg.CosNaming,org.omg.IOP,org.omg.PortableInterceptor,org
- .omg.stub.java.rmi,org.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317122432
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA EJB Binding Runtime
-Bundle-Name: Apache Tuscany SCA EJB Binding Runtime
-Private-Package: org.apache.tuscany.sca.binding.ejb.corba;version="1.4
- ",org.apache.tuscany.sca.binding.ejb.provider;version="1.4",org.apach
- e.tuscany.sca.binding.ejb.util;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .omg.stub.java.rmi,org.osoa.sca;version="1.4",org.osoa.sca.annotation
+ s;version="1.4";resolution:=optional,junit.framework;resolution:=opti
+ onal,org.apache.tuscany.sca.node;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
index de56c0699a..6e9468f4d2 100644
--- a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
@@ -1,6 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.ejb;uses:="org.apache.t
+ uscany.sca.assembly,javax.xml.namespace";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.ejb.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA EJB Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397146656
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA EJB Binding 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.binding.ejb;version="1.4",org.apache
@@ -8,16 +18,6 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core;v
  ersion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.
  tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317041403
-Export-Package: org.apache.tuscany.sca.binding.ejb;uses:="javax.xml.na
- mespace,org.apache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA EJB Binding Model
-Bundle-Description: Apache Tuscany SCA EJB Binding Model
-Private-Package: org.apache.tuscany.sca.binding.ejb.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 6447f6afb0..0fcb7735a4 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
@@ -1,6 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.gdata.collection;uses:=
+ "org.osoa.sca.annotations,com.google.gdata.client,com.google.gdata.da
+ ta";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.gdata.provider;version
+ ="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Gdata Binding Extension Runtime GSOC
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397270375
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Gdata Binding Extension Runtime
+  GSOC
 Import-Package: com.google.gdata.client,com.google.gdata.data,com.goog
  le.gdata.util,com.google.gdata.util.common.xml,javax.servlet,javax.se
  rvlet.http,javax.xml.namespace,org.apache.abdera.parser,org.apache.co
@@ -17,20 +30,9 @@ Import-Package: com.google.gdata.client,com.google.gdata.data,com.goog
  .interfacedef.util;version="1.4",org.apache.tuscany.sca.invocation;ve
  rsion="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"
-Bnd-LastModified: 1225317136370
-Export-Package: org.apache.tuscany.sca.binding.gdata.collection;uses:=
- "com.google.gdata.client,org.osoa.sca.annotations,com.google.gdata.da
- ta";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Gdata Binding Extension Runtime GSOC
-Bundle-Description: Apache Tuscany SCA Gdata Binding Extension Runtime
-  GSOC
-Private-Package: org.apache.tuscany.sca.binding.gdata.provider;version
- ="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .sca.annotations;version="1.4",junit.framework;resolution:=optional,o
+ rg.apache.tuscany.sca.node;resolution:=optional,org.junit;resolution:
+ =optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
index c4ea12216e..7a9b95a055 100644
--- a/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.gdata;uses:="org.apache
+ .tuscany.sca.assembly";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.gdata.impl;version="1.
+ 4",org.apache.tuscany.sca.binding.gdata.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Gdata Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397266640
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Gdata Binding Extension
 Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.binding.gdata;ver
  sion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4
  ",org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apac
  he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.policy;versi
  on="1.4"
-Bnd-LastModified: 1225317133042
-Export-Package: org.apache.tuscany.sca.binding.gdata;uses:="org.apache
- .tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Gdata Binding Extension
-Bundle-Description: Apache Tuscany SCA Gdata Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.gdata.impl;version="1.
- 4",org.apache.tuscany.sca.binding.gdata.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 51fd3c8c5a..3528e092fc 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
@@ -1,22 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.http.provider;version=
+ "1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA HTTP Binding Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397277718
+Bundle-ManifestVersion: 2
 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,org.apache.tuscany.sc
  a.assembly;version="1.4",org.apache.tuscany.sca.binding.http;version=
  "1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sc
  a.host.http;version="1.4",org.apache.tuscany.sca.interfacedef;version
  ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus
  cany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;versio
- n="1.4"
-Bnd-LastModified: 1225317141104
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA HTTP Binding Runtime
-Bundle-Name: Apache Tuscany SCA HTTP Binding Runtime
-Private-Package: org.apache.tuscany.sca.binding.http.provider;version=
- "1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ n="1.4",org.osoa.sca.annotations;version="1.4";resolution:=optional,j
+ unit.framework;resolution:=optional,org.apache.tuscany.sca.node;resol
+ ution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.http.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
index afedfc9efb..e9b65ddbac 100644
--- a/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.http;uses:="org.apache.
+ tuscany.sca.assembly,javax.servlet.http";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.http.impl;version="1.4
+ "
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA HTTP Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397256703
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA HTTP Binding Model
 Import-Package: javax.servlet.http,org.apache.tuscany.sca.assembly;ver
  sion="1.4",org.apache.tuscany.sca.assembly.xml;version="1.4",org.apac
  he.tuscany.sca.binding.http;version="1.4"
-Bnd-LastModified: 1225317126448
-Export-Package: org.apache.tuscany.sca.binding.http;uses:="javax.servl
- et.http,org.apache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA HTTP Binding Model
-Bundle-Description: Apache Tuscany SCA HTTP Binding Model
-Private-Package: org.apache.tuscany.sca.binding.http.impl;version="1.4
- "
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.http
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index 20966a8703..10da1fcff8 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
@@ -1,6 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.jms.provider;uses:="org
+ .apache.tuscany.sca.runtime,javax.jms,org.apache.tuscany.sca.provider
+ ,org.apache.tuscany.sca.core,org.apache.axiom.om,javax.xml.stream,org
+ .apache.tuscany.sca.binding.jms,org.apache.tuscany.sca.core.assembly,
+ org.osoa.sca,org.apache.tuscany.sca.core.invocation,javax.naming,org.
+ apache.tuscany.sca.assembly,org.apache.tuscany.sca.binding.ws.wsdlgen
+ ,org.apache.axiom.om.impl.builder,org.apache.tuscany.sca.interfacedef
+ .java,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.interface
+ def,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.binding.
+ ws,org.apache.tuscany.sca.work";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JMS Binding Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397307750
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA JMS Binding Runtime
 Import-Package: javax.jms,javax.naming,javax.xml.stream;version="1.0",
  org.apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tusca
  ny.sca.assembly;version="1.4",org.apache.tuscany.sca.binding.jms;vers
@@ -13,24 +30,8 @@ Import-Package: javax.jms,javax.naming,javax.xml.stream;version="1.0",
  on="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.t
  uscany.sca.monitor;version="1.4",org.apache.tuscany.sca.provider;vers
  ion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tus
- cany.sca.work;version="1.4",org.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317162463
-Export-Package: org.apache.tuscany.sca.binding.jms.provider;uses:="org
- .apache.tuscany.sca.monitor,org.apache.tuscany.sca.binding.jms,org.ap
- ache.tuscany.sca.binding.ws.wsdlgen,org.apache.tuscany.sca.core.invoc
- ation,org.apache.tuscany.sca.binding.ws,org.apache.tuscany.sca.runtim
- e,javax.naming,org.apache.axiom.om,org.apache.tuscany.sca.assembly,ja
- vax.xml.stream,org.apache.tuscany.sca.interfacedef.java,org.apache.tu
- scany.sca.work,org.apache.tuscany.sca.core.assembly,org.apache.tuscan
- y.sca.invocation,org.apache.tuscany.sca.provider,org.osoa.sca,org.apa
- che.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,javax.jms,or
- g.apache.axiom.om.impl.builder";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA JMS Binding Runtime
-Bundle-Name: Apache Tuscany SCA JMS Binding Runtime
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ cany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.osoa.sca.a
+ nnotations;version="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 f75fdf0009..4621ed0960 100644
--- a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.jms;uses:="org.apache.t
+ uscany.sca.assembly";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="1.4"
+ ,org.apache.tuscany.sca.binding.jms.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JMS Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397280359
+Bundle-ManifestVersion: 2
 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,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers
  ion="1.4",org.apache.tuscany.sca.binding.jms;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;v
  ersion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.
- tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317143057
-Export-Package: org.apache.tuscany.sca.binding.jms;uses:="org.apache.t
- uscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA JMS Binding Model
-Bundle-Description: Apache Tuscany SCA JMS Binding Model
-Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="1.4"
- ,org.apache.tuscany.sca.binding.jms.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ tuscany.sca.policy;version="1.4",junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 50c75e378c..a6a23e3178 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
@@ -1,6 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.jsonrpc.provider;uses:=
+ "org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.a
+ pache.tuscany.sca.provider,org.json,org.apache.tuscany.sca.core,org.a
+ pache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.interfaced
+ ef,javax.servlet,org.apache.tuscany.sca.invocation,com.metaparadigm.j
+ sonrpc,org.apache.tuscany.sca.binding.jsonrpc,org.apache.tuscany.sca.
+ host.http,org.osoa.sca,javax.servlet.http";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397318078
+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,javax.servlet,javax.servlet.h
  ttp,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.
  sca.assembly.xml,org.apache.tuscany.sca.binding.jsonrpc;version="1.4"
@@ -10,21 +24,10 @@ Import-Package: com.metaparadigm.jsonrpc,javax.servlet,javax.servlet.h
  pache.tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.
  sca.invocation;version="1.4",org.apache.tuscany.sca.provider;version=
  "1.4",org.apache.tuscany.sca.runtime;version="1.4",org.json,org.osoa.
- sca;version="1.4"
-Bnd-LastModified: 1225317167119
-Export-Package: org.apache.tuscany.sca.binding.jsonrpc.provider;uses:=
- "javax.servlet.http,org.apache.tuscany.sca.invocation,org.json,org.ap
- ache.tuscany.sca.host.http,org.apache.tuscany.sca.runtime,org.apache.
- tuscany.sca.binding.jsonrpc,org.apache.tuscany.sca.provider,javax.ser
- vlet,com.metaparadigm.jsonrpc,org.osoa.sca,org.apache.tuscany.sca.int
- erfacedef,org.apache.tuscany.sca.core,org.apache.tuscany.sca.assembly
- ,org.apache.tuscany.sca.interfacedef.java";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime
-Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Runtime
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ sca;version="1.4",org.osoa.sca.annotations;version="1.4";resolution:=
+ optional,junit.framework;resolution:=optional,com.meterware.httpunit;
+ resolution:=optional,org.apache.tuscany.sca.node;resolution:=optional
+ ,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index cb41b6ad1d..8ffba5b43e 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.assembly.xml;version="1.4",org.apache.tuscany.sca.bind
- ing.jsonrpc;version="1.4",org.apache.tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317163869
 Export-Package: org.apache.tuscany.sca.binding.jsonrpc;uses:="org.apac
  he.tuscany.sca.assembly,org.apache.tuscany.sca.policy";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Model
-Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Model
 Private-Package: org.apache.tuscany.sca.binding.jsonrpc.impl;version="
  1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397309921
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Model
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
+ he.tuscany.sca.assembly.xml;version="1.4",org.apache.tuscany.sca.bind
+ ing.jsonrpc;version="1.4",org.apache.tuscany.sca.policy;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 5b051e30d5..33ebb1a33c 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
@@ -1,6 +1,15 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.rmi.provider;version="
+ 1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA RMI Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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: net.sf.cglib.asm,net.sf.cglib.proxy,org.apache.tuscany
  .sca.assembly;version="1.4",org.apache.tuscany.sca.binding.rmi;versio
  n="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.
@@ -9,16 +18,9 @@ Import-Package: net.sf.cglib.asm,net.sf.cglib.proxy,org.apache.tuscany
  ache.tuscany.sca.interfacedef.java.impl;version="1.4",org.apache.tusc
  any.sca.invocation;version="1.4",org.apache.tuscany.sca.provider;vers
  ion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.osoa.sca;v
- ersion="1.4"
-Bnd-LastModified: 1225317170978
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA RMI Binding Extension
-Bundle-Name: Apache Tuscany SCA RMI Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.rmi.provider;version="
- 1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ersion="1.4",org.osoa.sca.annotations;version="1.4";resolution:=optio
+ nal,junit.framework;resolution:=optional,org.apache.tuscany.sca.node;
+ resolution:=optional,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi.runtime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
index 6c9a28d1a4..10d09e6a03 100644
--- a/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.assembly.xml;version="1.4",org.apache.tuscany.sca.bind
- ing.rmi;version="1.4"
-Bnd-LastModified: 1225317168431
 Export-Package: org.apache.tuscany.sca.binding.rmi;uses:="org.apache.t
  uscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA RMI Binding Model
-Bundle-Description: Apache Tuscany SCA RMI Binding Model
 Private-Package: org.apache.tuscany.sca.binding.rmi.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA RMI Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397320062
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA RMI Binding Model
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
+ he.tuscany.sca.assembly.xml;version="1.4",org.apache.tuscany.sca.bind
+ ing.rmi;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 27f3e0f836..b6024e0c93 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
@@ -1,6 +1,15 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.rss.collection;version
+ ="1.4",org.apache.tuscany.sca.binding.rss.provider;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397329562
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension
 Import-Package: com.sun.syndication.feed.atom,com.sun.syndication.feed
  .synd,com.sun.syndication.io,javax.servlet,javax.servlet.http,javax.x
  ml.namespace,org.apache.commons.codec.binary,org.apache.tuscany.sca.a
@@ -13,16 +22,9 @@ Import-Package: com.sun.syndication.feed.atom,com.sun.syndication.feed
  ="1.4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apa
  che.tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.provi
  der;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.os
- oa.sca.annotations;version="1.4"
-Bnd-LastModified: 1225317174463
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension
-Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.rss.collection;version
- ="1.4",org.apache.tuscany.sca.binding.rss.provider;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ oa.sca.annotations;version="1.4",org.apache.tuscany.sca.binding.rss.c
+ ollection;resolution:=optional,org.apache.tuscany.sca.node;resolution
+ :=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss.rome
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
index 7c27598299..c2b76fa34c 100644
--- a/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.binding.rss;version="1.4",org.apache.tuscany.sca.polic
- y;version="1.4"
-Bnd-LastModified: 1225317172447
 Export-Package: org.apache.tuscany.sca.binding.rss;uses:="org.apache.t
  uscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension
-Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension
 Private-Package: org.apache.tuscany.sca.binding.rss.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397326765
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
+ he.tuscany.sca.binding.rss;version="1.4",org.apache.tuscany.sca.polic
+ y;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 05ac29ff10..07abf859aa 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
@@ -1,6 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.sca.axis2.impl;version
+ ="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Axis2-based Default Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397360421
+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
@@ -12,17 +22,11 @@ Import-Package: org.apache.axiom.om,org.apache.tuscany.sca.assembly;ve
  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"
-Bnd-LastModified: 1225317199275
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Axis2-based Default Binding Ext
- ension
-Bundle-Name: Apache Tuscany SCA Axis2-based Default Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.sca.axis2.impl;version
- ="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ,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
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
index 5234f22438..f4cccb8b8a 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
@@ -1,6 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.sca.corba.impl;version
+ ="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA CORBA-based Default Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397364015
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA CORBA-based Default Binding Ext
+ ension
 Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver
  sion="1.0",org.apache.axiom.om,org.apache.axiom.om.impl.builder,org.a
  pache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.bindi
@@ -16,16 +26,6 @@ Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver
  ocation;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",or
  g.apache.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.ru
  ntime;version="1.4",org.omg.CORBA,org.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317203634
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA CORBA-based Default Binding Ext
- ension
-Bundle-Name: Apache Tuscany SCA CORBA-based Default Binding Extension
-Private-Package: org.apache.tuscany.sca.binding.sca.corba.impl;version
- ="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.corba
-Tool: Bnd-0.0.255
+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 073ddfa0b1..781b18fc98 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
@@ -1,20 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.sca.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Default Binding XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397190578
+Bundle-ManifestVersion: 2
 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,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.monitor;versi
- on="1.4",org.apache.tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317070152
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Default Binding XML Model
-Bundle-Name: Apache Tuscany SCA Default Binding XML Model
-Private-Package: org.apache.tuscany.sca.binding.sca.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ on="1.4",org.apache.tuscany.sca.policy;version="1.4",junit.framework;
+ resolution:=optional,org.apache.tuscany.sca.definitions;version="1.4"
+ ;resolution:=optional,org.apache.tuscany.sca.assembly.builder;version
+ ="1.4";resolution:=optional,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.xml
-Tool: Bnd-0.0.255
+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 66365ddc86..6fa343d3f5 100644
--- a/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.sca;uses:="org.apache.t
+ uscany.sca.assembly";version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="1.4"
+ ,org.apache.tuscany.sca.binding.sca.provider;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Default Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397165593
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Default Binding Model
 Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  he.tuscany.sca.assembly.builder;version="1.4",org.apache.tuscany.sca.
  binding.sca;version="1.4",org.apache.tuscany.sca.contribution.process
@@ -9,18 +20,14 @@ Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  cedef;version="1.4",org.apache.tuscany.sca.invocation;version="1.4",o
  rg.apache.tuscany.sca.policy;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"
-Bnd-LastModified: 1225317053949
-Export-Package: org.apache.tuscany.sca.binding.sca;uses:="org.apache.t
- uscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Default Binding Model
-Bundle-Description: Apache Tuscany SCA Default Binding Model
-Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="1.4"
- ,org.apache.tuscany.sca.binding.sca.provider;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ osoa.sca;version="1.4",org.apache.tuscany.sca.binding.sca.impl;resolu
+ 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
+ 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
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 c737c7c84c..bb70e86671 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
@@ -1,6 +1,29 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.configu
+ ration;uses:="org.apache.axis2,org.apache.tuscany.sca.runtime,org.apa
+ che.tuscany.sca.assembly,org.apache.tuscany.sca.provider,org.apache.t
+ uscany.sca.core,org.apache.axis2.context,org.apache.tuscany.sca.monit
+ or,org.apache.tuscany.sca.policy,javax.xml.namespace,org.apache.axiom
+ .om,org.apache.axis2.description,javax.xml.stream,org.apache.axis2.en
+ gine,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.
+ sca.policy.util,org.apache.tuscany.sca.contribution.processor,org.oso
+ a.sca";version="1.4",org.apache.tuscany.sca.binding.ws.axis2.policy.a
+ uthentication.basic;uses:="org.apache.tuscany.sca.runtime,org.apache.
+ tuscany.sca.assembly,org.apache.tuscany.sca.provider,org.apache.tusca
+ ny.sca.core,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.moni
+ tor,org.apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apach
+ e.tuscany.sca.invocation,javax.xml.stream,org.apache.tuscany.sca.cont
+ ribution.resolver,org.apache.tuscany.sca.contribution.processor";vers
+ ion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Policy Model for Axis2 WS binding
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397340328
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany Policy Model for Axis2 WS binding
 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.t
@@ -14,30 +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"
-Bnd-LastModified: 1225317181916
-Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.authent
- ication.basic;uses:="org.apache.tuscany.sca.invocation,javax.xml.name
- space,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.contribut
- ion.resolver,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.con
- tribution.processor,org.apache.tuscany.sca.runtime,org.apache.tuscany
- .sca.provider,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.
- sca.core,org.apache.tuscany.sca.assembly,javax.xml.stream";version="1
- .4",org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;uses
- :="org.apache.axis2.description,org.apache.axis2.engine,org.apache.ax
- is2.context,javax.xml.namespace,org.apache.tuscany.sca.monitor,org.ap
- ache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca.policy,
- org.apache.tuscany.sca.contribution.processor,org.apache.axis2,org.ap
- ache.tuscany.sca.runtime,org.apache.tuscany.sca.provider,org.osoa.sca
- ,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy.util,org.a
- pache.axiom.om,org.apache.tuscany.sca.assembly,javax.xml.stream";vers
- ion="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Policy Model for Axis2 WS binding
-Bundle-Name: Apache Tuscany Policy Model for Axis2 WS binding
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ a;version="1.4",junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.ws
-Tool: Bnd-0.0.255
+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 aed9999fb2..032e020b9d 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
@@ -1,6 +1,46 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.ws.axis2;uses:="org.apa
+ che.axis2.deployment.util,org.apache.tuscany.sca.definitions,org.apac
+ he.tuscany.sca.policy.authentication.basic,org.apache.tuscany.sca.pol
+ icy.security.ws,org.apache.ws.security.handler,javax.xml.namespace,or
+ g.apache.axiom.om,org.xml.sax,org.apache.commons.httpclient,org.apach
+ e.axiom.soap,org.apache.axis2.util,javax.servlet,javax.xml.stream,org
+ .apache.tuscany.sca.core.assembly,org.apache.axis2.transport.http.ser
+ ver,org.osoa.sca,org.apache.axis2.i18n,org.apache.axis2.transport,org
+ .apache.axis2.transport.jms,org.apache.axis2.client,org.apache.axis2.
+ context,org.apache.axiom.om.impl.builder,org.apache.tuscany.sca.inter
+ facedef.java,org.w3c.dom,javax.wsdl,org.apache.tuscany.sca.xsd.xml,or
+ g.apache.tuscany.sca.binding.ws,org.apache.axis2.engine,org.apache.ax
+ is2.receivers,org.apache.commons.httpclient.params,org.apache.tuscany
+ .sca.interfacedef.wsdl,org.apache.tuscany.sca.xsd,org.apache.tuscany.
+ sca.databinding,org.apache.axis2.addressing,org.apache.axis2.deployme
+ nt,org.apache.axis2.transport.http,org.apache.tuscany.sca.runtime,org
+ .apache.commons.logging,org.apache.tuscany.sca.interfacedef.util,org.
+ apache.tuscany.sca.provider,org.apache.tuscany.sca.core,javax.xml.tra
+ nsform.dom,org.apache.tuscany.sca.policy,org.apache.axis2.description
+ ,javax.wsdl.extensions,org.apache.tuscany.sca.host.http,org.apache.tu
+ scany.sca.policy.util,org.apache.axis2.util.threadpool,org.apache.ws.
+ security,org.apache.axis2,org.apache.ws.commons.schema,org.apache.tus
+ cany.sca.assembly,org.apache.ws.commons.schema.resolver,javax.wsdl.ex
+ tensions.soap,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.
+ sca.invocation,javax.xml.transform,javax.wsdl.extensions.soap12,org.a
+ pache.tuscany.sca.contribution.processor,javax.servlet.http";version=
+ "1.4"
+Private-Package: org.apache.tuscany.sca.binding.ws.axis2.engine.config
+ ;version="1.4",org.apache.tuscany.sca.binding.ws.axis2.engine.config.
+ modules;version="1.4",org.apache.tuscany.sca.binding.ws.axis2.engine.
+ config.services;version="1.4",org.apache.tuscany.sca.binding.ws.axis2
+ .policy.authentication.basic;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Axis2-based WS Binding Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397353000
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio
+ n
 Import-Package: javax.servlet,javax.servlet.http,javax.wsdl,javax.wsdl
  .extensions,javax.wsdl.extensions.soap,javax.wsdl.extensions.soap12,j
  avax.xml.namespace;version="1.0",javax.xml.stream;version="1.0",javax
@@ -32,47 +72,11 @@ Import-Package: javax.servlet,javax.servlet.http,javax.wsdl,javax.wsdl
  .4",org.apache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.common
  s.schema,org.apache.ws.commons.schema.resolver,org.apache.ws.security
  ,org.apache.ws.security.handler,org.osoa.sca;version="1.4",org.w3c.do
- m,org.xml.sax
-Bnd-LastModified: 1225317194275
-Export-Package: org.apache.tuscany.sca.binding.ws.axis2;uses:="javax.s
- ervlet.http,org.apache.axis2.context,org.apache.axis2.engine,javax.ws
- dl.extensions.soap,org.apache.commons.httpclient.params,javax.xml.nam
- espace,org.apache.axis2.addressing,org.apache.tuscany.sca.xsd,javax.w
- sdl.extensions.soap12,org.apache.tuscany.sca.binding.ws,javax.xml.tra
- nsform,javax.servlet,org.apache.tuscany.sca.assembly,org.apache.axis2
- .deployment,org.apache.ws.commons.schema,org.apache.tuscany.sca.host.
- http,org.apache.tuscany.sca.xsd.xml,org.apache.tuscany.sca.contributi
- on.processor,org.apache.tuscany.sca.interfacedef.wsdl,org.apache.axio
- m.soap,org.apache.ws.commons.schema.resolver,org.apache.tuscany.sca.p
- rovider,org.apache.axis2.receivers,org.osoa.sca,org.apache.tuscany.sc
- a.interfacedef,org.apache.tuscany.sca.policy.util,org.apache.axis2.de
- ployment.util,org.apache.axis2.util.threadpool,org.apache.axis2.i18n,
- org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.databinding,org
- .apache.axis2.client,org.apache.axis2.transport.jms,org.apache.axiom.
- om,org.apache.tuscany.sca.definitions,org.apache.tuscany.sca.interfac
- edef.java,javax.xml.stream,javax.wsdl,org.apache.axis2.description,or
- g.apache.tuscany.sca.policy.authentication.basic,org.apache.tuscany.s
- ca.core.assembly,org.xml.sax,org.apache.tuscany.sca.invocation,org.ap
- ache.axis2.transport.http,org.apache.tuscany.sca.interfacedef.util,or
- g.w3c.dom,org.apache.commons.logging,org.apache.tuscany.sca.policy,or
- g.apache.axis2.util,org.apache.axis2,javax.xml.transform.dom,org.apac
- he.commons.httpclient,javax.wsdl.extensions,org.apache.tuscany.sca.po
- licy.security.ws,org.apache.ws.security.handler,org.apache.tuscany.sc
- a.core,org.apache.axis2.transport,org.apache.ws.security,org.apache.a
- xis2.transport.http.server,org.apache.axiom.om.impl.builder";version=
- "1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Axis2-based WS Binding Extension
-Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio
- n
-Private-Package: org.apache.tuscany.sca.binding.ws.axis2.engine.config
- ;version="1.4",org.apache.tuscany.sca.binding.ws.axis2.engine.config.
- modules;version="1.4",org.apache.tuscany.sca.binding.ws.axis2.engine.
- config.services;version="1.4",org.apache.tuscany.sca.binding.ws.axis2
- .policy.authentication.basic;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ m,org.xml.sax,javax.security.auth.callback;resolution:=optional,org.o
+ soa.sca.annotations;version="1.4";resolution:=optional,javax.wsdl.fac
+ tory;resolution:=optional,org.apache.tuscany.sca.node;resolution:=opt
+ ional,org.junit;resolution:=optional,junit.framework;resolution:=opti
+ onal,javax.wsdl.xml;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 baf45d3c3f..c8f2da9e1c 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
@@ -1,6 +1,26 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.ws.wsdlgen;uses:="org.a
+ pache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.uti
+ l,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy,javax.wsd
+ l.extensions.schema,javax.xml.namespace,javax.wsdl.xml,javax.wsdl.ext
+ ensions,org.apache.tuscany.sca.contribution.resolver,org.osoa.sca,org
+ .apache.ws.commons.schema,javax.wsdl.factory,org.apache.tuscany.sca.a
+ ssembly,javax.wsdl.extensions.soap,javax.xml.parsers,org.apache.tusca
+ ny.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tu
+ scany.sca.interfacedef,org.w3c.dom,javax.wsdl,org.apache.tuscany.sca.
+ binding.ws,javax.wsdl.extensions.soap12,org.apache.tuscany.sca.databi
+ nding.jaxb,org.apache.tuscany.sca.interfacedef.wsdl,org.apache.ws.com
+ mons.schema.utils,org.apache.tuscany.sca.xsd";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Web Service binding WSDL Generator
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397303515
+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.
@@ -15,27 +35,15 @@ Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions
  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
-Bnd-LastModified: 1225317159385
-Export-Package: org.apache.tuscany.sca.binding.ws.wsdlgen;uses:="javax
- .wsdl.extensions.soap,javax.xml.namespace,org.apache.tuscany.sca.moni
- tor,org.apache.tuscany.sca.xsd,org.apache.tuscany.sca.contribution.re
- solver,javax.wsdl.extensions.soap12,org.apache.tuscany.sca.binding.ws
- ,org.apache.tuscany.sca.databinding,javax.wsdl.factory,javax.xml.pars
- ers,javax.wsdl.extensions.schema,org.apache.tuscany.sca.assembly,org.
- apache.tuscany.sca.databinding.jaxb,org.apache.tuscany.sca.interfaced
- ef.java,javax.wsdl,javax.wsdl.xml,org.apache.ws.commons.schema,org.ap
- ache.tuscany.sca.interfacedef.util,org.w3c.dom,org.apache.tuscany.sca
- .policy,org.apache.tuscany.sca.interfacedef.wsdl,javax.wsdl.extension
- s,org.apache.ws.commons.schema.utils,org.osoa.sca,org.apache.tuscany.
- sca.interfacedef,org.apache.tuscany.sca.core";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Web Service binding WSDL Genera
- tor
-Bundle-Name: Apache Tuscany SCA Web Service binding WSDL Generator
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.wsdlgen
-Tool: Bnd-0.0.255
+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 98ae4c45c8..625c056274 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
@@ -1,6 +1,14 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.binding.ws.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA WS Binding XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397333296
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA WS Binding XML Model
 Import-Package: javax.wsdl,javax.xml.namespace;version="1.0",javax.xml
  .parsers,javax.xml.stream;version="1.0",javax.xml.transform,javax.xml
  .transform.dom,org.apache.tuscany.sca.assembly;version="1.4",org.apac
@@ -12,15 +20,8 @@ Import-Package: javax.wsdl,javax.xml.namespace;version="1.0",javax.xml
  e;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org
  .apache.tuscany.sca.interfacedef.wsdl;version="1.4",org.apache.tuscan
  y.sca.monitor;version="1.4",org.apache.tuscany.sca.policy;version="1.
- 4",org.w3c.dom
-Bnd-LastModified: 1225317176619
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA WS Binding XML Model
-Bundle-Name: Apache Tuscany SCA WS Binding XML Model
-Private-Package: org.apache.tuscany.sca.binding.ws.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 4",org.w3c.dom,org.apache.tuscany.sca.definitions;version="1.4";resol
+ ution:=optional,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
index 6a1115f9db..f7d2ff7b31 100644
--- a/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.binding.ws;uses:="org.apache.tu
+ scany.sca.assembly,org.apache.tuscany.sca.interfacedef.wsdl,org.apach
+ e.tuscany.sca.assembly.builder,org.apache.tuscany.sca.interfacedef,or
+ g.w3c.dom,javax.wsdl,javax.xml.namespace";version="1.4",org.apache.tu
+ scany.sca.binding.ws.addressing;uses:="javax.xml.namespace";version="
+ 1.4"
+Private-Package: org.apache.tuscany.sca.binding.ws.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA WS Binding Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397286828
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA WS Binding Model
 Import-Package: javax.wsdl,javax.xml.namespace,org.apache.tuscany.sca.
  assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;versio
  n="1.4",org.apache.tuscany.sca.binding.ws;version="1.4",org.apache.tu
  scany.sca.binding.ws.addressing;version="1.4",org.apache.tuscany.sca.
  interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.wsdl;v
  ersion="1.4",org.apache.tuscany.sca.policy;version="1.4",org.w3c.dom
-Bnd-LastModified: 1225317147588
-Export-Package: org.apache.tuscany.sca.binding.ws.addressing;uses:="ja
- vax.xml.namespace";version="1.4",org.apache.tuscany.sca.binding.ws;us
- es:="javax.wsdl,org.apache.tuscany.sca.assembly.builder,javax.xml.nam
- espace,org.apache.tuscany.sca.interfacedef,org.w3c.dom,org.apache.tus
- cany.sca.assembly,org.apache.tuscany.sca.interfacedef.wsdl";version="
- 1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA WS Binding Model
-Bundle-Description: Apache Tuscany SCA WS Binding Model
-Private-Package: org.apache.tuscany.sca.binding.ws.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws
-Tool: Bnd-0.0.255
+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 341d92a034..6a9483de17 100644
--- a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
@@ -1,24 +1,25 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.
- java;version="1.4",org.apache.tuscany.sca.contribution.processor;vers
- ion="1.4",org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.exte
- nsibility;version="1.4",org.apache.tuscany.sca.monitor;version="1.4"
-Bnd-LastModified: 1225317018825
 Export-Package: org.apache.tuscany.sca.contribution.java;uses:="org.ap
  ache.tuscany.sca.contribution";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Java Import/Export Model
-Bundle-Description: Apache Tuscany SCA Java Import/Export Model
 Private-Package: org.apache.tuscany.sca.contribution.java.impl;version
  ="1.4"
-Bundle-DocURL: http://www.apache.org/
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Import/Export Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+DynamicImport-Package: org.apache.tuscany.sca.contribution.osgi.impl
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397112984
 Bundle-ManifestVersion: 2
+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,org.apache.tuscan
+ y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.
+ java;version="1.4",org.apache.tuscany.sca.contribution.processor;vers
+ ion="1.4",org.apache.tuscany.sca.contribution.resolver;version="1.4",
+ org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.exte
+ nsibility;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",
+ org.junit;resolution:=optional,junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.java
-Tool: Bnd-0.0.255
-DynamicImport-Package: org.apache.tuscany.sca.contribution.osgi.impl
+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 a5fbe82733..bfdb174046 100644
--- a/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
@@ -1,23 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.contribution.namespace;uses:="o
+ rg.apache.tuscany.sca.contribution";version="1.4"
+Private-Package: org.apache.tuscany.sca.contribution.namespace.impl;ve
+ rsion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Namespace Import/Export Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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"
-Bnd-LastModified: 1225317016950
-Export-Package: org.apache.tuscany.sca.contribution.namespace;uses:="o
- rg.apache.tuscany.sca.contribution";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Namespace Import/Export Model
-Bundle-Description: Apache Tuscany SCA Namespace Import/Export Model
-Private-Package: org.apache.tuscany.sca.contribution.namespace.impl;ve
- rsion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .monitor;version="1.4",junit.framework;resolution:=optional,org.junit
+ ;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.namespace
-Tool: Bnd-0.0.255
+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 ac19197d44..759dd26a7b 100644
--- a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.contribution.resource;uses:="or
+ g.apache.tuscany.sca.contribution";version="1.4"
+Private-Package: org.apache.tuscany.sca.contribution.resource.impl;ver
+ sion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Resource Import/Export Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397365937
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Resource 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.
  processor;version="1.4",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"
-Bnd-LastModified: 1225317204900
-Export-Package: org.apache.tuscany.sca.contribution.resource;uses:="or
- g.apache.tuscany.sca.contribution";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Resource Import/Export Model
-Bundle-Description: Apache Tuscany SCA Resource Import/Export Model
-Private-Package: org.apache.tuscany.sca.contribution.resource.impl;ver
- sion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ monitor;version="1.4",org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.resource
-Tool: Bnd-0.0.255
+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 6f6570b95f..775b81b625 100644
--- a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -1,27 +1,28 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.contribution.xml;uses:="org.apa
+ che.tuscany.sca.assembly,org.apache.tuscany.sca.core,org.apache.tusca
+ ny.sca.contribution,org.apache.tuscany.sca.monitor,javax.xml.namespac
+ e,javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,org.a
+ pache.tuscany.sca.contribution.processor";version="1.4"
+Private-Package: org.apache.tuscany.sca.contribution.processor.xml;ver
+ sion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA XML Contribution Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397199187
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA XML Contribution Model
 Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream
  ,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca
  .contribution;version="1.4",org.apache.tuscany.sca.contribution.proce
  ssor;version="1.4",org.apache.tuscany.sca.contribution.resolver;versi
  on="1.4",org.apache.tuscany.sca.contribution.xml;version="1.4",org.ap
  ache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.monitor;ve
- rsion="1.4",org.w3c.dom,org.w3c.dom.traversal
-Bnd-LastModified: 1225317076214
-Export-Package: org.apache.tuscany.sca.contribution.xml;uses:="org.apa
- che.tuscany.sca.monitor,javax.xml.namespace,org.apache.tuscany.sca.co
- ntribution.resolver,org.apache.tuscany.sca.contribution,org.apache.tu
- scany.sca.contribution.processor,org.apache.tuscany.sca.core,org.apac
- he.tuscany.sca.assembly,javax.xml.stream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA XML Contribution Model
-Bundle-Description: Apache Tuscany SCA XML Contribution Model
-Private-Package: org.apache.tuscany.sca.contribution.processor.xml;ver
- sion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ rsion="1.4",org.w3c.dom,org.w3c.dom.traversal,org.junit;resolution:=o
+ ptional
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
index e7ea921256..2a04c04043 100644
--- a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
@@ -1,6 +1,29 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.contribution.scanner;uses:="org
+ .apache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.ext
+ ensibility";version="1.4",org.apache.tuscany.sca.contribution.resolve
+ r;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.extensibil
+ ity";version="1.4",org.apache.tuscany.sca.contribution.processor;uses
+ :="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,org.ap
+ ache.tuscany.sca.policy,org.apache.tuscany.sca.monitor,org.apache.tus
+ cany.sca.extensibility,org.xml.sax,javax.xml.namespace,javax.xml.stre
+ am,javax.xml.stream.util,javax.xml.transform,org.apache.tuscany.sca.c
+ ontribution.resolver,javax.xml.transform.stream,javax.xml.validation,
+ org.xml.sax.helpers";version="1.4",org.apache.tuscany.sca.contributio
+ n;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contr
+ ibution.resolver";version="1.4"
+Private-Package: org.apache.tuscany.sca.contribution.impl;version="1.4
+ "
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Contribution Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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.
@@ -10,30 +33,8 @@ Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.stream.
  ,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
-Bnd-LastModified: 1225317010559
-Export-Package: org.apache.tuscany.sca.contribution.scanner;uses:="org
- .apache.tuscany.sca.extensibility,org.apache.tuscany.sca.contribution
- .processor";version="1.4",org.apache.tuscany.sca.contribution.resolve
- r;uses:="org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.
- core,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contribut
- ion";version="1.4",org.apache.tuscany.sca.contribution;uses:="org.apa
- che.tuscany.sca.contribution.resolver,org.apache.tuscany.sca.assembly
- ";version="1.4",org.apache.tuscany.sca.contribution.processor;uses:="
- org.xml.sax,org.apache.tuscany.sca.extensibility,javax.xml.namespace,
- org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.contribution.re
- solver,org.apache.tuscany.sca.policy,javax.xml.transform,javax.xml.va
- lidation,org.xml.sax.helpers,org.apache.tuscany.sca.core,javax.xml.tr
- ansform.stream,org.apache.tuscany.sca.assembly,javax.xml.stream.util,
- javax.xml.stream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Contribution Model
-Bundle-Description: Apache Tuscany SCA Contribution Model
-Private-Package: org.apache.tuscany.sca.contribution.impl;version="1.4
- "
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ helpers,junit.framework;resolution:=optional,org.junit;resolution:=op
+ tional
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution
-Tool: Bnd-0.0.255
+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 12eabe48f0..77c5880edc 100644
--- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.core.databinding.module;versio
+ n="1.4",org.apache.tuscany.sca.core.databinding.processor;version="1.
+ 4",org.apache.tuscany.sca.core.databinding.transformers;version="1.4"
+ ,org.apache.tuscany.sca.core.databinding.wire;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Core/DataBinding Integration
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397235359
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Core/DataBinding Integration
 Import-Package: javax.xml.bind.annotation.adapters,javax.xml.namespace
  ,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,org.
  apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.cont
@@ -17,18 +28,8 @@ Import-Package: javax.xml.bind.annotation.adapters,javax.xml.namespace
  e.tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.
  invocation;version="1.4",org.apache.tuscany.sca.runtime;version="1.4"
  ,org.apache.tuscany.sca.xsd;version="1.4",org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
-Bnd-LastModified: 1225317104683
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Core/DataBinding Integration
-Bundle-Name: Apache Tuscany SCA Core/DataBinding Integration
-Private-Package: org.apache.tuscany.sca.core.databinding.module;versio
- n="1.4",org.apache.tuscany.sca.core.databinding.processor;version="1.
- 4",org.apache.tuscany.sca.core.databinding.transformers;version="1.4"
- ,org.apache.tuscany.sca.core.databinding.wire;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ org.osoa.sca.annotations;version="1.4",org.w3c.dom;resolution:=option
+ al,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
index 2fa64a2033..012d96995f 100644
--- a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
@@ -1,6 +1,30 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.invocation;uses:="org.apache.tu
+ scany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="1.4",
+ org.apache.tuscany.sca.runtime;uses:="org.apache.tuscany.sca.invocati
+ on,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.endpointres
+ olver,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany
+ .sca.interfacedef";version="1.4",org.apache.tuscany.sca.context;uses:
+ ="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.
+ apache.tuscany.sca.core,org.osoa.sca,org.apache.tuscany.sca.extensibi
+ lity";version="1.4",org.apache.tuscany.sca.provider;uses:="org.apache
+ .tuscany.sca.invocation,org.apache.tuscany.sca.runtime,org.apache.tus
+ cany.sca.assembly,org.apache.tuscany.sca.definitions,org.apache.tusca
+ ny.sca.core,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sc
+ a.extensibility";version="1.4",org.apache.tuscany.sca.endpointresolve
+ r;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.extensibility";version="1.4",org.apache.tuscan
+ y.sca.work;version="1.4",org.apache.tuscany.sca.management;uses:="org
+ .apache.tuscany.sca.runtime";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Core SPI
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397108125
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Core SPI
 Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.core;vers
  ion="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.apache
@@ -9,31 +33,8 @@ Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus
  cany.sca.management;version="1.4",org.apache.tuscany.sca.provider;ver
  sion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tu
- scany.sca.work;version="1.4",org.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317015325
-Export-Package: org.apache.tuscany.sca.runtime;uses:="org.apache.tusca
- ny.sca.provider,org.apache.tuscany.sca.invocation,org.osoa.sca,org.ap
- ache.tuscany.sca.interfacedef,org.apache.tuscany.sca.assembly,org.apa
- che.tuscany.sca.endpointresolver";version="1.4",org.apache.tuscany.sc
- a.work;version="1.4",org.apache.tuscany.sca.provider;uses:="org.apach
- e.tuscany.sca.runtime,org.apache.tuscany.sca.extensibility,org.apache
- .tuscany.sca.invocation,org.apache.tuscany.sca.interfacedef,org.apach
- e.tuscany.sca.core,org.apache.tuscany.sca.definitions,org.apache.tusc
- any.sca.assembly";version="1.4",org.apache.tuscany.sca.context;uses:=
- "org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.extensibility,
- org.osoa.sca,org.apache.tuscany.sca.core,org.apache.tuscany.sca.assem
- bly";version="1.4",org.apache.tuscany.sca.invocation;uses:="org.apach
- e.tuscany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="1
- .4",org.apache.tuscany.sca.management;uses:="org.apache.tuscany.sca.r
- untime";version="1.4",org.apache.tuscany.sca.endpointresolver;uses:="
- org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.core,org.
- apache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Core SPI
-Bundle-Name: Apache Tuscany SCA Core SPI
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ scany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.junit;res
+ olution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
-Tool: Bnd-0.0.255
+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 23932670de..99ccbb2124 100644
--- a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
@@ -1,6 +1,52 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
+ .tuscany.sca.runtime,org.apache.tuscany.sca.context,org.apache.tuscan
+ y.sca.provider,org.apache.tuscany.sca.core.context,org.apache.tuscany
+ .sca.assembly.impl,org.apache.tuscany.sca.core,org.apache.tuscany.sca
+ .core.conversation,javax.xml.namespace,javax.xml.stream,org.apache.tu
+ scany.sca.endpointresolver,org.apache.tuscany.sca.contribution.resolv
+ er,org.apache.tuscany.sca.core.invocation,org.osoa.sca,org.apache.tus
+ cany.sca.core.scope,org.apache.tuscany.sca.assembly,org.apache.tuscan
+ y.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tus
+ cany.sca.interfacedef,org.apache.tuscany.sca.invocation,org.apache.tu
+ scany.sca.work,org.apache.tuscany.sca.contribution.processor";version
+ ="1.4",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.osoa.
+ sca.annotations,commonj.work,org.apache.tuscany.sca.work";version="1.
+ 4",org.apache.tuscany.sca.core.context;uses:="org.apache.tuscany.sca.
+ runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contex
+ t,javax.security.auth,org.apache.tuscany.sca.monitor,org.apache.tusca
+ ny.sca.interfacedef.java,org.apache.tuscany.sca.core.conversation,org
+ .apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apache.tusca
+ ny.sca.invocation,javax.xml.stream,org.apache.tuscany.sca.core.assemb
+ ly,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.contrib
+ ution.processor,org.osoa.sca,org.apache.tuscany.sca.core.invocation,o
+ rg.apache.tuscany.sca.core.scope,org.apache.tuscany.sca.assembly.buil
+ der";version="1.4",org.apache.tuscany.sca.core.factory;version="1.4",
+ org.apache.tuscany.sca.core.invocation;uses:="org.apache.tuscany.sca.
+ runtime,org.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.s
+ ca.assembly,net.sf.cglib.proxy,org.apache.tuscany.sca.provider,org.ap
+ ache.tuscany.sca.core.context,org.apache.tuscany.sca.core,org.apache.
+ tuscany.sca.core.conversation,org.apache.tuscany.sca.interfacedef.jav
+ a,org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.interfa
+ cedef,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.a
+ ssembly,org.apache.tuscany.sca.work,org.apache.tuscany.sca.core.facto
+ ry,org.osoa.sca,org.apache.tuscany.sca.core.scope";version="1.4",org.
+ apache.tuscany.sca.core.conversation;uses:="org.apache.tuscany.sca.ru
+ ntime,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany
+ .sca.core.scope";version="1.4",org.apache.tuscany.sca.core.scope;uses
+ :="org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.runtime,o
+ rg.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.context,or
+ g.apache.tuscany.sca.core.invocation,org.apache.tuscany.sca.core.conv
+ ersation";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Core Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397162265
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Core Runtime
 Import-Package: commonj.work,javax.naming,javax.security.auth,javax.xm
  l.namespace,javax.xml.stream,net.sf.cglib.proxy,org.apache.tuscany.sc
  a.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;vers
@@ -21,53 +67,10 @@ Import-Package: commonj.work,javax.naming,javax.security.auth,javax.xm
  ersion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache
  .tuscany.sca.runtime;version="1.4",org.apache.tuscany.sca.work;versio
  n="1.4",org.osoa.sca;version="1.4",org.osoa.sca.annotations;version="
- 1.4"
-Bnd-LastModified: 1225317051699
-Export-Package: org.apache.tuscany.sca.core.factory;version="1.4",org.
- apache.tuscany.sca.core.scope;uses:="org.apache.tuscany.sca.runtime,o
- rg.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.context,or
- g.apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.conversat
- ion,org.apache.tuscany.sca.core.invocation";version="1.4",org.apache.
- tuscany.sca.core.assembly;uses:="org.apache.tuscany.sca.core.scope,ja
- vax.xml.namespace,org.apache.tuscany.sca.monitor,org.apache.tuscany.s
- ca.contribution.resolver,org.apache.tuscany.sca.core.invocation,org.a
- pache.tuscany.sca.runtime,org.apache.tuscany.sca.core.conversation,or
- g.apache.tuscany.sca.assembly,javax.xml.stream,org.apache.tuscany.sca
- .interfacedef.java,org.apache.tuscany.sca.work,org.apache.tuscany.sca
- .context,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.end
- pointresolver,org.apache.tuscany.sca.contribution.processor,org.apach
- e.tuscany.sca.provider,org.apache.tuscany.sca.core.context,org.osoa.s
- ca,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,or
- g.apache.tuscany.sca.assembly.impl";version="1.4",org.apache.tuscany.
- sca.core.context;uses:="org.apache.tuscany.sca.core.scope,org.apache.
- tuscany.sca.core.assembly,org.apache.tuscany.sca.context,org.apache.t
- uscany.sca.invocation,javax.xml.namespace,org.apache.tuscany.sca.moni
- tor,org.apache.tuscany.sca.core.invocation,org.apache.tuscany.sca.con
- tribution.processor,org.apache.tuscany.sca.runtime,org.apache.tuscany
- .sca.core.factory,org.apache.tuscany.sca.assembly.builder,org.osoa.sc
- a,org.apache.tuscany.sca.core.conversation,org.apache.tuscany.sca.int
- erfacedef,org.apache.tuscany.sca.assembly,javax.security.auth,org.apa
- che.tuscany.sca.interfacedef.java,javax.xml.stream";version="1.4",org
- .apache.tuscany.sca.core.work;uses:="org.osoa.sca.annotations,javax.n
- aming,org.apache.tuscany.sca.work,commonj.work";version="1.4",org.apa
- che.tuscany.sca.core.conversation;uses:="org.apache.tuscany.sca.runti
- me,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.scope,
- org.osoa.sca";version="1.4",org.apache.tuscany.sca.core.invocation;us
- es:="org.apache.tuscany.sca.work,org.apache.tuscany.sca.core.scope,or
- g.apache.tuscany.sca.core.assembly,org.apache.tuscany.sca.extensibili
- ty,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.interface
- def.util,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.r
- untime,org.apache.tuscany.sca.provider,net.sf.cglib.proxy,org.apache.
- tuscany.sca.core.context,org.osoa.sca,org.apache.tuscany.sca.core.con
- versation,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.
- core,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.interface
- def.java";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Core Runtime
-Bundle-Name: Apache Tuscany SCA Core Runtime
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 1.4",org.junit;resolution:=optional,junit.framework;resolution:=optio
+ nal,org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution
+ :=optional,org.apache.tuscany.sca.core.wire;version="1.4";resolution:
+ =optional
 Bundle-SymbolicName: org.apache.tuscany.sca.core
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
index 7b0c9fb50a..3776d4802a 100644
--- a/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.data.collection;version="1.4",o
- rg.osoa.sca.annotations;version="1.4"
-Bnd-LastModified: 1225317124354
 Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.osoa
  .sca.annotations";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data API
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Data API
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397254562
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data API
+Import-Package: org.apache.tuscany.sca.data.collection;version="1.4",o
+ rg.osoa.sca.annotations;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.data.api
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 9280141fd9..d7cb0bf1ac 100644
--- a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -1,6 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.databinding.axiom;uses:="org.ap
+ ache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.util
+ ,org.apache.tuscany.sca.databinding.impl,org.apache.axiom.om.impl.bui
+ lder,org.apache.tuscany.sca.interfacedef,org.apache.axiom.om,javax.xm
+ l.namespace,javax.xml.stream,org.apache.tuscany.sca.interfacedef.impl
+ ,org.apache.tuscany.sca.databinding.javabeans";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for Axiom
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397285015
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for Axiom
 Import-Package: javax.xml.namespace,javax.xml.stream;version="1.0",org
  .apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tuscany.
  sca.databinding;version="1.4",org.apache.tuscany.sca.databinding.axio
@@ -8,20 +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"
-Bnd-LastModified: 1225317146323
-Export-Package: org.apache.tuscany.sca.databinding.axiom;uses:="org.ap
- ache.tuscany.sca.databinding.impl,org.apache.tuscany.sca.interfacedef
- .impl,javax.xml.namespace,org.apache.tuscany.sca.interfacedef.util,or
- g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef,
- org.apache.tuscany.sca.databinding.javabeans,org.apache.axiom.om,org.
- apache.axiom.om.impl.builder,javax.xml.stream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for Axiom
-Bundle-Name: Apache Tuscany SCA Data Binding for Axiom
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ersion="1.4",junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom
-Tool: Bnd-0.0.255
+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 d93a98d24b..168607e5f8 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
@@ -1,20 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.databinding.fastinfoset;versio
+ n="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Data Binding for FastInfoset
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397405343
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany Data Binding for FastInfoset
 Import-Package: com.sun.xml.fastinfoset.dom,com.sun.xml.fastinfoset.sa
  x,com.sun.xml.fastinfoset.stax,javax.xml.parsers,javax.xml.stream,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.w3c.dom,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1225317236227
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Data Binding for FastInfoset
-Bundle-Name: Apache Tuscany Data Binding for FastInfoset
-Private-Package: org.apache.tuscany.sca.databinding.fastinfoset;versio
- n="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ;version="1.4",org.w3c.dom,org.xml.sax,org.xml.sax.helpers,junit.fram
+ ework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.fastinfoset
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 ce5f5ab022..0daa6dc7fb 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
@@ -1,6 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.databinding.jaxb.axiom;version
+ ="1.4",org.apache.tuscany.sca.databinding.jaxb.axiom.ext;version="1.4
+ "
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for JAXB-AXIOM
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -8,17 +18,13 @@ Import-Package: javax.xml.bind,javax.xml.bind.attachment,javax.xml.nam
  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"
-Bnd-LastModified: 1225317179025
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for JAXB-AXIOM
-Bundle-Name: Apache Tuscany SCA Data Binding for JAXB-AXIOM
-Private-Package: org.apache.tuscany.sca.databinding.jaxb.axiom;version
- ="1.4",org.apache.tuscany.sca.databinding.jaxb.axiom.ext;version="1.4
- "
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .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
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb.axiom
-Tool: Bnd-0.0.255
+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 a2f052669b..6d8f6f95df 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
@@ -1,6 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.databinding.jaxb;uses:="org.apa
+ che.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.util,
+ javax.xml.transform.dom,org.xml.sax,javax.xml.namespace,javax.imageio
+ ,javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,org.ap
+ ache.tuscany.sca.databinding.util,org.osoa.sca,org.apache.tuscany.sca
+ .databinding.xml,org.apache.tuscany.sca.databinding.impl,org.apache.w
+ s.commons.schema.resolver,org.apache.tuscany.sca.interfacedef,org.w3c
+ .dom,javax.xml.datatype,javax.activation,javax.xml.bind.attachment,ja
+ vax.xml.transform,javax.xml.bind.annotation,javax.xml.transform.strea
+ m,org.apache.tuscany.sca.interfacedef.impl,org.apache.tuscany.sca.xsd
+ ,javax.xml.bind";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for JAXB
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397221390
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for JAXB
 Import-Package: javax.activation,javax.imageio,javax.xml.bind,javax.xm
  l.bind.annotation,javax.xml.bind.attachment,javax.xml.datatype,javax.
  xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.transfor
@@ -13,25 +31,18 @@ Import-Package: javax.activation,javax.imageio,javax.xml.bind,javax.xm
  he.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.apache.ws.commons.schema.resolver,org.osoa.sca;version="1.4"
- ,org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1225317090917
-Export-Package: org.apache.tuscany.sca.databinding.jaxb;uses:="javax.x
- ml.bind.attachment,javax.xml.namespace,org.apache.tuscany.sca.xsd,org
- .apache.tuscany.sca.contribution.resolver,javax.xml.datatype,javax.xm
- l.transform,org.apache.tuscany.sca.databinding.util,org.apache.tuscan
- y.sca.databinding,javax.xml.transform.stream,javax.xml.stream,org.apa
- che.tuscany.sca.databinding.impl,org.xml.sax,javax.imageio,org.apache
- .tuscany.sca.interfacedef.impl,javax.activation,org.apache.tuscany.sc
- a.interfacedef.util,org.w3c.dom,javax.xml.bind.annotation,javax.xml.t
- ransform.dom,org.apache.ws.commons.schema.resolver,org.apache.tuscany
- .sca.databinding.xml,org.osoa.sca,org.apache.tuscany.sca.interfacedef
- ,javax.xml.bind";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for JAXB
-Bundle-Name: Apache Tuscany SCA Data Binding for JAXB
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ,org.w3c.dom,org.xml.sax,org.jvnet.jaxb.reflection.model.impl;resolut
+ ion:=optional,org.jvnet.jaxb.reflection.runtime;resolution:=optional,
+ com.sun.xml.bind.v2.runtime;resolution:=optional,com.sun.xml.bind.v2.
+ model.runtime;resolution:=optional,junit.framework;resolution:=option
+ al,com.sun.xml.bind.v2.model.impl;resolution:=optional,com.sun.xml.bi
+ nd.v2.model.annotation;resolution:=optional,org.jvnet.jaxb.reflection
+ .model.core;resolution:=optional,org.jvnet.jaxb.reflection.model.runt
+ ime;resolution:=optional,org.junit;resolution:=optional,com.sun.xml.b
+ ind.v2.model.core;resolution:=optional,org.jvnet.jaxb.reflection.mode
+ l.annotation;resolution:=optional,org.jvnet.jaxb.reflection.runtime.r
+ eflect;resolution:=optional,com.sun.xml.bind.v2.runtime.reflect;resol
+ ution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 b68c1ba03e..3e84fa61d7 100644
--- a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
@@ -1,6 +1,15 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.databinding.json;version="1.4"
+ ,org.apache.tuscany.sca.databinding.json.axiom;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for JSON
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397312078
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for JSON
 Import-Package: com.metaparadigm.jsonrpc,javax.xml.namespace,javax.xml
  .stream;version="1.0",org.apache.axiom.om,org.apache.tuscany.sca.data
  binding;version="1.4",org.apache.tuscany.sca.databinding.impl;version
@@ -8,16 +17,10 @@ Import-Package: com.metaparadigm.jsonrpc,javax.xml.namespace,javax.xml
  e.tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.inter
  facedef.util;version="1.4",org.codehaus.jettison.badgerfish,org.codeh
  aus.jettison.json,org.codehaus.jettison.mapped,org.json,org.osoa.sca.
- annotations;version="1.4"
-Bnd-LastModified: 1225317165244
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for JSON
-Bundle-Name: Apache Tuscany SCA Data Binding for JSON
-Private-Package: org.apache.tuscany.sca.databinding.json;version="1.4"
- ,org.apache.tuscany.sca.databinding.json.axiom;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ annotations;version="1.4",org.apache.tuscany.sca.databinding.json.axi
+ om;resolution:=optional,org.junit;resolution:=optional,junit.framewor
+ k;resolution:=optional,org.apache.tuscany.sca.interfacedef.impl;versi
+ on="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
index ac6c68e67b..257fe78305 100644
--- a/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
@@ -1,6 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.databinding.saxon;uses:="org.ap
+ ache.tuscany.sca.databinding,net.sf.saxon.value,org.apache.tuscany.sc
+ a.databinding.impl,net.sf.saxon.trans,javax.xml.transform.dom,commonj
+ .sdo.helper,net.sf.saxon,org.apache.tuscany.sca.interfacedef,org.apac
+ he.tuscany.sca.databinding.saxon.collection,org.w3c.dom,net.sf.saxon.
+ query,commonj.sdo,net.sf.saxon.event,javax.xml.transform,net.sf.saxon
+ .om";version="1.4",org.apache.tuscany.sca.databinding.saxon.collectio
+ n;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for Saxon
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397384281
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for Saxon
 Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  2.1",javax.xml.transform,javax.xml.transform.dom,net.sf.saxon,net.sf.
  saxon.event,net.sf.saxon.om,net.sf.saxon.query,net.sf.saxon.trans,net
@@ -9,21 +24,6 @@ Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  sca.databinding.saxon;version="1.4",org.apache.tuscany.sca.databindin
  g.saxon.collection;version="1.4",org.apache.tuscany.sca.interfacedef;
  version="1.4",org.w3c.dom
-Bnd-LastModified: 1225317222305
-Export-Package: org.apache.tuscany.sca.databinding.saxon.collection;ve
- rsion="1.4",org.apache.tuscany.sca.databinding.saxon;uses:="org.apach
- e.tuscany.sca.databinding.saxon.collection,org.apache.tuscany.sca.dat
- abinding.impl,net.sf.saxon.query,org.w3c.dom,net.sf.saxon.om,net.sf.s
- axon.event,commonj.sdo.helper,javax.xml.transform,javax.xml.transform
- .dom,commonj.sdo,org.apache.tuscany.sca.databinding,net.sf.saxon.tran
- s,org.apache.tuscany.sca.interfacedef,net.sf.saxon,net.sf.saxon.value
- ";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for Saxon
-Bundle-Name: Apache Tuscany SCA Data Binding for Saxon
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.saxon
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 871b7aa464..9af551e901 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
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: com.example.ipo.sdo;version="1.4",com.example.ipo.sdo
+ .impl;version="1.4",com.example.stock.sdo;version="1.4",com.example.s
+ tock.sdo.impl;version="1.4",org.apache.tuscany.sca.databinding.sdo2om
+ ;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for SDO/AXIOM
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397381546
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for SDO/AXIOM
 Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  2.1",javax.xml.namespace,javax.xml.stream;version="1.0",org.apache.ax
  iom.om,org.apache.axiom.om.impl.builder,org.apache.axiom.om.impl.seri
@@ -10,18 +21,9 @@ Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  1.4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apach
  e.tuscany.sdo.api,org.apache.tuscany.sdo.helper,org.apache.tuscany.sd
  o.impl,org.apache.tuscany.sdo.model,org.apache.tuscany.sdo.model.impl
- ,org.eclipse.emf.ecore,org.eclipse.emf.ecore.util
-Bnd-LastModified: 1225317220555
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for SDO/AXIOM
-Bundle-Name: Apache Tuscany SCA Data Binding for SDO/AXIOM
-Private-Package: com.example.ipo.sdo;version="1.4",com.example.ipo.sdo
- .impl;version="1.4",com.example.stock.sdo;version="1.4",com.example.s
- tock.sdo.impl;version="1.4",org.apache.tuscany.sca.databinding.sdo2om
- ;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ,org.eclipse.emf.ecore,org.eclipse.emf.ecore.util,commonj.sdo.impl;re
+ solution:=optional,junit.framework;resolution:=optional,org.apache.tu
+ scany.sca.interfacedef.impl;version="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo.axiom
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 a487d3728f..e37ae9b1ae 100644
--- a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
@@ -1,6 +1,28 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.databinding.sdo;uses:="org.apac
+ he.tuscany.sca.databinding,commonj.sdo.impl,org.apache.tuscany.sca.in
+ terfacedef.util,org.apache.tuscany.sca.assembly.impl,javax.xml.transf
+ orm.dom,org.apache.tuscany.sca.core,commonj.sdo.helper,javax.xml.name
+ space,javax.xml.stream,org.w3c.dom.ls,org.apache.tuscany.sca.contribu
+ tion.resolver,org.apache.tuscany.sca.databinding.util,org.osoa.sca,or
+ g.apache.ws.commons.schema,org.apache.tuscany.sca.databinding.impl,or
+ g.apache.tuscany.sca.contribution,org.apache.tuscany.sca.monitor,org.
+ apache.tuscany.sdo.api,org.w3c.dom,org.apache.tuscany.sca.interfacede
+ f,org.w3c.dom.bootstrap,commonj.sdo,javax.xml.transform,org.apache.tu
+ scany.sca.interfacedef.impl,org.apache.tuscany.sca.contribution.proce
+ ssor,org.apache.tuscany.sca.xsd";version="1.4"
+Private-Package: com.example.ipo.sdo;version="1.4",com.example.ipo.sdo
+ .impl;version="1.4",com.example.stock.sdo;version="1.4",com.example.s
+ tock.sdo.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for SDO
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397376421
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Data Binding for SDO
 Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  2.1",commonj.sdo.impl,javax.xml.namespace,javax.xml.stream,javax.xml.
  transform,javax.xml.transform.dom,org.apache.tuscany.sca.assembly.imp
@@ -18,29 +40,9 @@ Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="
  sdo.impl,org.apache.tuscany.sdo.model,org.apache.tuscany.sdo.model.im
  pl,org.apache.ws.commons.schema,org.eclipse.emf.ecore,org.eclipse.emf
  .ecore.util,org.osoa.sca;version="1.4",org.w3c.dom,org.w3c.dom.bootst
- rap,org.w3c.dom.ls
-Bnd-LastModified: 1225317216946
-Export-Package: org.apache.tuscany.sca.databinding.sdo;uses:="org.w3c.
- dom.ls,javax.xml.namespace,org.apache.tuscany.sca.monitor,commonj.sdo
- .impl,org.apache.tuscany.sca.xsd,org.apache.tuscany.sca.contribution.
- resolver,commonj.sdo.helper,org.apache.tuscany.sca.contribution,javax
- .xml.transform,org.apache.tuscany.sca.databinding.util,org.apache.tus
- cany.sca.databinding,javax.xml.stream,org.apache.tuscany.sdo.api,org.
- apache.tuscany.sca.databinding.impl,org.apache.tuscany.sca.interfaced
- ef.impl,org.apache.ws.commons.schema,org.w3c.dom,org.apache.tuscany.s
- ca.interfacedef.util,org.apache.tuscany.sca.contribution.processor,ja
- vax.xml.transform.dom,org.w3c.dom.bootstrap,commonj.sdo,org.osoa.sca,
- org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,org.a
- pache.tuscany.sca.assembly.impl";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Data Binding for SDO
-Bundle-Description: Apache Tuscany SCA Data Binding for SDO
-Private-Package: com.example.ipo.sdo;version="1.4",com.example.ipo.sdo
- .impl;version="1.4",com.example.stock.sdo;version="1.4",com.example.s
- tock.sdo.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ rap,org.w3c.dom.ls,junit.framework;resolution:=optional,org.apache.tu
+ scany.sca.databinding.xml;version="1.4";resolution:=optional,org.juni
+ t;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 97d0982af7..7ec28531c0 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
@@ -1,21 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.databinding.xmlbeans;version="
+ 1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Data Binding for XmlBeans
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
-Bnd-LastModified: 1225317234993
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Data Binding for XmlBeans
-Bundle-Name: Apache Tuscany SCA Data Binding for XmlBeans
-Private-Package: org.apache.tuscany.sca.databinding.xmlbeans;version="
- 1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ,org.w3c.dom,org.apache.xmlbeans.impl.values;resolution:=optional,jun
+ it.framework;resolution:=optional,org.apache.xmlbeans.xml.stream;reso
+ lution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.xmlbeans
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
index 279256cef5..ebb12dab8c 100644
--- a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
@@ -1,6 +1,41 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.databinding;uses:="org.apache.t
+ uscany.sca.interfacedef.util,org.apache.tuscany.sca.databinding.impl,
+ org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.extensibil
+ ity,javax.xml.namespace,org.apache.tuscany.sca.contribution.resolver,
+ org.apache.tuscany.sca.interfacedef.impl,org.apache.tuscany.sca.xsd";
+ version="1.4",org.apache.tuscany.sca.databinding.xml;uses:="org.apach
+ e.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.util,or
+ g.apache.tuscany.sca.databinding.impl,javax.xml.parsers,javax.xml.tra
+ nsform.dom,org.w3c.dom,org.apache.tuscany.sca.interfacedef,org.xml.sa
+ x,javax.xml.namespace,javax.xml.stream,javax.xml.stream.util,org.xml.
+ sax.ext,javax.xml.transform,javax.xml.transform.stream,org.apache.tus
+ cany.sca.interfacedef.impl,javax.xml.transform.sax,org.apache.tuscany
+ .sca.databinding.javabeans,org.xml.sax.helpers";version="1.4",org.apa
+ che.tuscany.sca.databinding.impl;uses:="org.apache.tuscany.sca.databi
+ nding,org.apache.tuscany.sca.interfacedef.util,javax.xml.parsers,org.
+ apache.tuscany.sca.interfacedef,org.w3c.dom,javax.xml.datatype,javax.
+ xml.namespace,javax.xml.transform,org.apache.tuscany.sca.interfacedef
+ .impl";version="1.4",org.apache.tuscany.sca.databinding.util;uses:="o
+ rg.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.sca.interf
+ acedef";version="1.4",org.apache.tuscany.sca.databinding.annotation;v
+ ersion="1.4",org.apache.tuscany.sca.databinding.javabeans;uses:="org.
+ apache.tuscany.sca.databinding,org.apache.tuscany.sca.databinding.xml
+ ,org.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.sca.data
+ binding.impl,javax.xml.parsers,org.w3c.dom,org.apache.tuscany.sca.int
+ erfacedef,javax.xml.datatype,javax.xml.namespace,javax.xml.stream";ve
+ rsion="1.4"
+Private-Package: org.apache.tuscany.sca.databinding.externalizable;ver
+ sion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA DataBinding Framework
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -14,42 +49,8 @@ Import-Package: javax.xml.datatype,javax.xml.namespace,javax.xml.parse
  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
-Bnd-LastModified: 1225317064980
-Export-Package: org.apache.tuscany.sca.databinding.util;uses:="org.apa
- che.tuscany.sca.interfacedef,org.apache.tuscany.sca.interfacedef.util
- ";version="1.4",org.apache.tuscany.sca.databinding.xml;uses:="org.apa
- che.tuscany.sca.databinding.impl,org.xml.sax,org.apache.tuscany.sca.i
- nterfacedef.impl,javax.xml.namespace,org.apache.tuscany.sca.interface
- def.util,org.w3c.dom,javax.xml.transform,javax.xml.transform.dom,java
- x.xml.transform.sax,org.apache.tuscany.sca.databinding,org.xml.sax.ex
- t,org.xml.sax.helpers,javax.xml.parsers,org.apache.tuscany.sca.databi
- nding.javabeans,org.apache.tuscany.sca.interfacedef,javax.xml.transfo
- rm.stream,javax.xml.stream.util,javax.xml.stream";version="1.4",org.a
- pache.tuscany.sca.databinding.annotation;version="1.4",org.apache.tus
- cany.sca.databinding;uses:="org.apache.tuscany.sca.databinding.impl,o
- rg.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.interfaced
- ef.impl,javax.xml.namespace,org.apache.tuscany.sca.interfacedef.util,
- org.apache.tuscany.sca.xsd,org.apache.tuscany.sca.contribution.resolv
- er,org.apache.tuscany.sca.interfacedef";version="1.4",org.apache.tusc
- any.sca.databinding.impl;uses:="org.apache.tuscany.sca.interfacedef.i
- mpl,javax.xml.namespace,org.apache.tuscany.sca.interfacedef.util,org.
- w3c.dom,javax.xml.datatype,javax.xml.transform,org.apache.tuscany.sca
- .databinding,javax.xml.parsers,org.apache.tuscany.sca.interfacedef";v
- ersion="1.4",org.apache.tuscany.sca.databinding.javabeans;uses:="org.
- apache.tuscany.sca.databinding.impl,javax.xml.namespace,org.w3c.dom,o
- rg.apache.tuscany.sca.interfacedef.util,javax.xml.datatype,org.apache
- .tuscany.sca.databinding.xml,org.apache.tuscany.sca.databinding,javax
- .xml.parsers,org.apache.tuscany.sca.interfacedef,javax.xml.stream";ve
- rsion="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA DataBinding Framework
-Bundle-Description: Apache Tuscany SCA DataBinding Framework
-Private-Package: org.apache.tuscany.sca.databinding.externalizable;ver
- sion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .helpers,org.custommonkey.xmlunit;resolution:=optional,org.junit;reso
+ lution:=optional,junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding
-Tool: Bnd-0.0.255
+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 531c382c3e..f51d1d3fcf 100644
--- a/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.definitions.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Definitions XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397117406
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Definitions XML 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.definitions.ut
  il;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apa
- che.tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317022747
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Definitions XML Model
-Bundle-Name: Apache Tuscany SCA Definitions XML Model
-Private-Package: org.apache.tuscany.sca.definitions.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ che.tuscany.sca.policy;version="1.4",org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.definitions.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
index 113d9ac1c8..94962f0fd7 100644
--- a/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.definitions.util;uses:="org.apa
+ che.tuscany.sca.definitions";version="1.4",org.apache.tuscany.sca.def
+ initions;uses:="org.apache.tuscany.sca.policy,javax.xml.namespace";ve
+ rsion="1.4"
+Private-Package: org.apache.tuscany.sca.definitions.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Definitions
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397089625
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Definitions
 Import-Package: javax.xml.namespace,org.apache.tuscany.sca.definitions
  ;version="1.4",org.apache.tuscany.sca.definitions.util;version="1.4",
  org.apache.tuscany.sca.policy;version="1.4"
-Bnd-LastModified: 1225317001185
-Export-Package: org.apache.tuscany.sca.definitions;uses:="javax.xml.na
- mespace,org.apache.tuscany.sca.policy";version="1.4",org.apache.tusca
- ny.sca.definitions.util;uses:="org.apache.tuscany.sca.definitions";ve
- rsion="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Definitions
-Bundle-Description: Apache Tuscany SCA Definitions
-Private-Package: org.apache.tuscany.sca.definitions.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.definitions
-Tool: Bnd-0.0.255
+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 3237530401..c4126fa360 100644
--- a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
@@ -1,6 +1,32 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.domain.manager.impl;uses:="org.
+ apache.commons.fileupload.disk,org.apache.tuscany.sca.runtime,org.apa
+ che.tuscany.sca.data.collection,org.apache.tuscany.sca.core.context,o
+ rg.apache.tuscany.sca.definitions,org.apache.tuscany.sca.binding.atom
+ ,org.apache.tuscany.sca.core,javax.xml.namespace,javax.servlet,javax.
+ xml.stream,org.apache.tuscany.sca.core.assembly,org.apache.tuscany.sc
+ a.contribution.resolver,org.apache.tuscany.sca.workspace,org.apache.t
+ uscany.sca.core.invocation,org.osoa.sca,org.apache.tuscany.sca.assemb
+ ly.builder,org.apache.tuscany.sca.implementation.node,org.osoa.sca.an
+ notations,org.apache.tuscany.sca.assembly,org.apache.commons.fileuplo
+ ad,org.apache.commons.fileupload.servlet,org.apache.tuscany.sca.works
+ pace.builder,javax.xml.parsers,org.apache.tuscany.sca.contribution,or
+ g.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.monitor
+ ,org.apache.tuscany.sca.interfacedef,org.w3c.dom,org.apache.xml.seria
+ lize,org.apache.tuscany.sca.contribution.processor,javax.servlet.http
+ ";version="1.4",org.apache.tuscany.sca.domain.manager.launcher;uses:=
+ "org.apache.tuscany.sca.domain.manager.impl,org.apache.tuscany.sca.no
+ de,org.osoa.sca";version="1.4"
+Private-Package: icons;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Domain Manager Application
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397422109
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Domain Manager Application
 Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,j
  avax.xml.parsers,javax.xml.stream,org.apache.commons.fileupload,org.a
  pache.commons.fileupload.disk,org.apache.commons.fileupload.servlet,o
@@ -21,33 +47,8 @@ Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,j
  de;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa
  che.tuscany.sca.workspace;version="1.4",org.apache.tuscany.sca.worksp
  ace.builder;version="1.4",org.apache.xml.serialize,org.osoa.sca;versi
- on="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom
-Bnd-LastModified: 1225317247430
-Export-Package: org.apache.tuscany.sca.domain.manager.launcher;uses:="
- org.apache.tuscany.sca.node,org.osoa.sca,org.apache.tuscany.sca.domai
- n.manager.impl";version="1.4",org.apache.tuscany.sca.domain.manager.i
- mpl;uses:="javax.servlet.http,org.osoa.sca.annotations,org.apache.tus
- cany.sca.monitor,javax.xml.namespace,org.apache.tuscany.sca.contribut
- ion.resolver,org.apache.tuscany.sca.binding.atom,org.apache.tuscany.s
- ca.contribution,org.apache.tuscany.sca.core.invocation,org.apache.com
- mons.fileupload,org.apache.tuscany.sca.runtime,javax.servlet,javax.xm
- l.parsers,org.apache.tuscany.sca.definitions,org.apache.tuscany.sca.a
- ssembly,org.apache.tuscany.sca.interfacedef.java,javax.xml.stream,org
- .apache.tuscany.sca.workspace,org.apache.tuscany.sca.core.assembly,or
- g.apache.xml.serialize,org.w3c.dom,org.apache.tuscany.sca.workspace.b
- uilder,org.apache.tuscany.sca.contribution.processor,org.apache.tusca
- ny.sca.assembly.builder,org.apache.tuscany.sca.core.context,org.osoa.
- sca,org.apache.commons.fileupload.servlet,org.apache.tuscany.sca.inte
- rfacedef,org.apache.tuscany.sca.core,org.apache.tuscany.sca.implement
- ation.node,org.apache.tuscany.sca.data.collection,org.apache.commons.
- fileupload.disk";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Domain Manager Application
-Bundle-Description: Apache Tuscany SCA Domain Manager Application
-Private-Package: icons;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ on="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,junit.fra
+ mework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
index 1237c2391b..38dacdc20c 100644
--- a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
@@ -1,18 +1,31 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-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"
-Bnd-LastModified: 1225317106964
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Default Endpoint Implementation
-Bundle-Name: Apache Tuscany SCA Default Endpoint Implementation
 Private-Package: org.apache.tuscany.sca.binding.sca;version="1.4",org.
  apache.tuscany.sca.endpoint.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Default Endpoint Implementation
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.endpoint
-Tool: Bnd-0.0.255
+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 5ded46e526..271dbbad9c 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
@@ -1,23 +1,25 @@
 Manifest-Version: 1.0
-Bundle-Activator: org.apache.tuscany.sca.extensibility.equinox.Equinox
- ServiceDiscoveryActivator
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-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"
-Bundle-ActivationPolicy: lazy
-Bnd-LastModified: 1225317249258
-Bundle-Version: 1.4
-Eclipse-LazyStart: true
-Bundle-Name: Apache Tuscany SCA Extensibility for Eclipse Equinox
-Bundle-Description: Apache Tuscany SCA Extensibility for Eclipse Equin
- ox
 Private-Package: org.apache.tuscany.sca.extensibility.equinox;version=
  "1.4"
-Bundle-DocURL: http://www.apache.org/
+Bundle-ActivationPolicy: lazy
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Extensibility for Eclipse Equinox
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+DynamicImport-Package: *
+Eclipse-LazyStart: true
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397425625
+Bundle-Activator: org.apache.tuscany.sca.extensibility.equinox.Equinox
+ ServiceDiscoveryActivator
 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
 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility.equinox
-Tool: Bnd-0.0.255
-DynamicImport-Package: *
+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 3f86e1d235..fecd405b79 100644
--- a/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
@@ -1,19 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.core;version="1.4",org.apache.t
- uscany.sca.extensibility;version="1.4"
-Bnd-LastModified: 1225316992325
-Export-Package: org.apache.tuscany.sca.extensibility;version="1.4",org
- .apache.tuscany.sca.core;uses:="org.apache.tuscany.sca.extensibility"
+Export-Package: org.apache.tuscany.sca.core;uses:="org.apache.tuscany.
+ sca.extensibility";version="1.4",org.apache.tuscany.sca.extensibility
  ;version="1.4"
-Bundle-Version: 1.4
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Extensibility
-Bundle-Description: Apache Tuscany SCA Extensibility
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility
-Tool: Bnd-0.0.255
-DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox
+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 2deb342f63..580b3e5499 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
@@ -1,17 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.host.corba.jee;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JEE environment CORBA Host
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
-Bnd-LastModified: 1225317250946
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA JEE environment CORBA Host
-Bundle-Name: Apache Tuscany SCA JEE environment CORBA Host
-Private-Package: org.apache.tuscany.sca.host.corba.jee;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jee
-Tool: Bnd-0.0.255
+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 1cc3291bcf..fb71a63a38 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
@@ -1,20 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.host.corba.jse.tns;version="1.
+ 4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Transient Name Server CORBA Host
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397430015
+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
-Bnd-LastModified: 1225317252430
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Transient Name Server CORBA Hos
- t
-Bundle-Name: Apache Tuscany SCA Transient Name Server CORBA Host
-Private-Package: org.apache.tuscany.sca.host.corba.jse.tns;version="1.
- 4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse.tns
-Tool: Bnd-0.0.255
+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 f0ca286ff3..4b941d32ce 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
@@ -1,25 +1,26 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.host.corba.naming;uses:="org.om
+ g.CosNaming.NamingContextPackage,org.omg.CosNaming,org.omg.CosNaming.
+ NamingContextExtPackage,org.omg.CORBA,org.omg.PortableServer";version
+ ="1.4",org.apache.tuscany.sca.host.corba.jse;uses:="org.omg.CosNaming
+ .NamingContextPackage,org.omg.CosNaming,org.apache.tuscany.sca.host.c
+ orba,org.omg.CORBA,org.apache.tuscany.sca.core";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JSE built-in CORBA Host
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397133187
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA JSE built-in CORBA Host
 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.omg.CosNaming,org.omg.CosNaming.NamingContextE
  xtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.PortableServ
- er
-Bnd-LastModified: 1225317034278
-Export-Package: org.apache.tuscany.sca.host.corba.naming;uses:="org.om
- g.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPa
- ckage,org.omg.CosNaming,org.omg.PortableServer,org.omg.CORBA";version
- ="1.4",org.apache.tuscany.sca.host.corba.jse;uses:="org.apache.tuscan
- y.sca.host.corba,org.omg.CosNaming.NamingContextPackage,org.omg.CosNa
- ming,org.apache.tuscany.sca.core,org.omg.CORBA";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA JSE built-in CORBA Host
-Bundle-Name: Apache Tuscany SCA JSE built-in CORBA Host
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ er,junit.framework;resolution:=optional,org.omg.CORBA.portable;resolu
+ tion:=optional,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse
-Tool: Bnd-0.0.255
+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 55d372cd42..f4846d0d70 100644
--- a/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.host.corba;version="1.4",org.om
- g.CORBA
-Bnd-LastModified: 1225317029887
 Export-Package: org.apache.tuscany.sca.host.corba;uses:="org.omg.CORBA
  ";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA CORBA Host Extension Point
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA CORBA Host Extension Point
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397126578
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
index 618587212f..328bc7b1f5 100644
--- a/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc
- a.host.http;version="1.4"
-Bnd-LastModified: 1225317125339
-Export-Package: org.apache.tuscany.sca.host.http;uses:="javax.servlet.
- http,javax.servlet";version="1.4"
+Export-Package: org.apache.tuscany.sca.host.http;uses:="javax.servlet,
+ javax.servlet.http";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA HTTP Servlet Host Extension Point
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
 Bundle-Version: 1.4
+Bnd-LastModified: 1225397255593
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA HTTP Servlet Host Extension Poi
  nt
-Bundle-Name: Apache Tuscany SCA HTTP Servlet Host Extension Point
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc
+ a.host.http;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.http
-Tool: Bnd-0.0.255
+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 544f8711f3..8e1c786799 100644
--- a/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
@@ -1,21 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.http.jetty;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Jetty Servlet Host Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397258562
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Jetty Servlet Host Extension
 Import-Package: javax.servlet,org.apache.tuscany.sca.core;version="1.4
  ",org.apache.tuscany.sca.host.http;version="1.4",org.apache.tuscany.s
  ca.work;version="1.4",org.mortbay.jetty;version="6.1.7",org.mortbay.j
  etty.handler;version="6.1.7",org.mortbay.jetty.nio;version="6.1.7",or
  g.mortbay.jetty.security;version="6.1.7",org.mortbay.jetty.servlet;ve
  rsion="6.1.7",org.mortbay.log;version="6.1.7",org.mortbay.resource;ve
- rsion="6.1.7",org.mortbay.thread;version="6.1.7"
-Bnd-LastModified: 1225317127792
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Jetty Servlet Host Extension
-Bundle-Name: Apache Tuscany SCA Jetty Servlet Host Extension
-Private-Package: org.apache.tuscany.sca.http.jetty;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ rsion="6.1.7",org.mortbay.thread;version="6.1.7",junit.framework;reso
+ lution:=optional,javax.net.ssl;resolution:=optional,javax.servlet.htt
+ p;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.host.jetty
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 2e2ecaba4f..3d39c888d1 100644
--- a/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
@@ -1,15 +1,16 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.host.rmi;version="1.4"
-Bnd-LastModified: 1225317169353
 Export-Package: org.apache.tuscany.sca.host.rmi;version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA RMI Host Extension Point
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA RMI Host Extension Point
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.host.rmi
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
index dbab5f3f27..eec19db794 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.host.webapp.junit;uses:="org.ju
+ nit.runner.notification,javax.servlet,junit.framework,org.junit.runne
+ r,javax.servlet.http";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Webapp JUnit Host
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397431421
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Webapp JUnit Host
 Import-Package: javax.servlet,javax.servlet.http,junit.framework,org.a
  pache.tuscany.sca.host.webapp.junit;version="1.4",org.junit.runner,or
  g.junit.runner.notification
-Bnd-LastModified: 1225317253367
-Export-Package: org.apache.tuscany.sca.host.webapp.junit;uses:="javax.
- servlet.http,org.junit.runner.notification,javax.servlet,junit.framew
- ork,org.junit.runner";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Webapp JUnit Host
-Bundle-Name: Apache Tuscany SCA Webapp JUnit Host
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp.junit
-Tool: Bnd-0.0.255
+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 a20361cba5..0636624d2e 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
@@ -1,6 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.implementation.bpel.ode;versio
+ n="1.4",org.apache.tuscany.sca.implementation.bpel.ode.provider;versi
+ on="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA BPEL ODE Implementation Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397447609
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi
+ on
 Import-Package: javax.sql,javax.transaction,javax.wsdl,javax.xml.names
  pace,org.apache.commons.logging,org.apache.geronimo.transaction.manag
  er,org.apache.ode.bpel.compiler,org.apache.ode.bpel.dao,org.apache.od
@@ -13,18 +24,8 @@ Import-Package: javax.sql,javax.transaction,javax.wsdl,javax.xml.names
  interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.wsdl;v
  ersion="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apac
  he.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;
- version="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom
-Bnd-LastModified: 1225317268570
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi
- on
-Bundle-Name: Apache Tuscany SCA BPEL ODE Implementation Extension
-Private-Package: org.apache.tuscany.sca.implementation.bpel.ode;versio
- n="1.4",org.apache.tuscany.sca.implementation.bpel.ode.provider;versi
- on="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ version="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,juni
+ t.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 75e45b944e..c81ec9d481 100644
--- a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
@@ -1,6 +1,18 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.bpel;uses:="org.
+ apache.tuscany.sca.assembly,org.apache.tuscany.sca.contribution.resol
+ ver,javax.xml.namespace";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.bpel.impl;versi
+ on="1.4",org.apache.tuscany.sca.implementation.bpel.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA BPEL Implementation Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397433843
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA BPEL Implementation Extension
 Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,j
  avax.xml.stream,org.apache.tuscany.sca.assembly;version="1.4",org.apa
  che.tuscany.sca.assembly.impl;version="1.4",org.apache.tuscany.sca.co
@@ -8,19 +20,8 @@ Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,j
  n.resolver;version="1.4",org.apache.tuscany.sca.core;version="1.4",or
  g.apache.tuscany.sca.implementation.bpel;version="1.4",org.apache.tus
  cany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.interfaced
- ef.wsdl;version="1.4",org.apache.tuscany.sca.monitor;version="1.4"
-Bnd-LastModified: 1225317255570
-Export-Package: org.apache.tuscany.sca.implementation.bpel;uses:="java
- x.xml.namespace,org.apache.tuscany.sca.contribution.resolver,org.apac
- he.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA BPEL Implementation Extension
-Bundle-Description: Apache Tuscany SCA BPEL Implementation Extension
-Private-Package: org.apache.tuscany.sca.implementation.bpel.impl;versi
- on="1.4",org.apache.tuscany.sca.implementation.bpel.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ef.wsdl;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",ju
+ nit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 f66d9bbc97..71fbee9b7d 100644
--- a/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
@@ -1,24 +1,29 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.ejb;uses:="org.a
+ pache.tuscany.sca.assembly";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.ejb.impl;versio
+ n="1.4",org.apache.tuscany.sca.implementation.ejb.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA EJB Session Bean Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397451671
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA EJB Session Bean Implementation
+  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.implementation.ejb;version="1.4",org.apache.tuscany.sca.monitor
- ;version="1.4"
-Bnd-LastModified: 1225317270664
-Export-Package: org.apache.tuscany.sca.implementation.ejb;uses:="org.a
- pache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA EJB Session Bean Implementation Model
-Bundle-Description: Apache Tuscany SCA EJB Session Bean Implementation
-  Model
-Private-Package: org.apache.tuscany.sca.implementation.ejb.impl;versio
- n="1.4",org.apache.tuscany.sca.implementation.ejb.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ;version="1.4",org.apache.tuscany.sca.assembly.builder.impl;resolutio
+ 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
+ a.assembly.builder;version="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.ejb
-Tool: Bnd-0.0.255
+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 44a1063e89..8301d356de 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
@@ -1,6 +1,31 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.java.context;use
+ s:="org.apache.tuscany.sca.core.context,org.apache.tuscany.sca.core.f
+ actory,org.apache.tuscany.sca.implementation.java,org.apache.tuscany.
+ sca.core.scope,org.apache.tuscany.sca.implementation.java.injection";
+ version="1.4",org.apache.tuscany.sca.implementation.java.injection;us
+ es:="org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.databi
+ nding.xml,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.inter
+ facedef.util,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.c
+ ontext,org.apache.tuscany.sca.databinding.impl,org.apache.tuscany.sca
+ .core.context,org.apache.tuscany.sca.implementation.java.introspect,o
+ rg.apache.tuscany.sca.implementation.java,org.apache.tuscany.sca.inte
+ rfacedef,org.w3c.dom,javax.xml.namespace,org.apache.tuscany.sca.invoc
+ ation,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.inte
+ rfacedef.impl,org.osoa.sca,org.apache.tuscany.sca.core.invocation";ve
+ rsion="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.java.invocation
+ ;version="1.4",org.apache.tuscany.sca.implementation.java.module;vers
+ ion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -20,33 +45,10 @@ Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
  ,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
-Bnd-LastModified: 1225317067777
-Export-Package: org.apache.tuscany.sca.implementation.java.context;use
- s:="org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.core.s
- cope,org.apache.tuscany.sca.core.context,org.apache.tuscany.sca.imple
- mentation.java,org.apache.tuscany.sca.implementation.java.injection";
- version="1.4",org.apache.tuscany.sca.implementation.java.injection;us
- es:="org.apache.tuscany.sca.databinding.impl,org.apache.tuscany.sca.c
- ontext,org.apache.tuscany.sca.interfacedef.impl,org.apache.tuscany.sc
- a.invocation,javax.xml.namespace,org.apache.tuscany.sca.interfacedef.
- util,org.w3c.dom,org.apache.tuscany.sca.implementation.java.introspec
- t,org.apache.tuscany.sca.core.invocation,org.apache.tuscany.sca.core.
- factory,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.databin
- ding.xml,org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.co
- re.context,org.osoa.sca,org.apache.tuscany.sca.implementation.java,or
- g.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.assembly";ve
- rsion="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Java Implementation Model
-Bundle-Description: Apache Tuscany SCA Java Implementation Model
-Private-Package: org.apache.tuscany.sca.implementation.java.invocation
- ;version="1.4",org.apache.tuscany.sca.implementation.java.module;vers
- ion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim
  e
-Tool: Bnd-0.0.255
+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 351c5ad3c1..3ef156b005 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
@@ -1,6 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.java.xml;uses:="
+ org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.implementation
+ .java.introspect,org.apache.tuscany.sca.implementation.java,org.apach
+ e.tuscany.sca.core,org.apache.tuscany.sca.policy,org.apache.tuscany.s
+ ca.interfacedef.java,org.apache.tuscany.sca.monitor,org.apache.tuscan
+ y.sca.interfacedef,javax.xml.namespace,javax.xml.stream,org.apache.tu
+ scany.sca.assembly.xml,org.apache.tuscany.sca.contribution.resolver,o
+ rg.apache.tuscany.sca.contribution.processor";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Implementation XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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"
@@ -10,22 +25,11 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  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"
-Bnd-LastModified: 1225317057949
-Export-Package: org.apache.tuscany.sca.implementation.java.xml;uses:="
- javax.xml.namespace,org.apache.tuscany.sca.monitor,org.apache.tuscany
- .sca.contribution.resolver,org.apache.tuscany.sca.implementation.java
- .introspect,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.cont
- ribution.processor,org.apache.tuscany.sca.assembly.xml,org.apache.tus
- cany.sca.implementation.java,org.apache.tuscany.sca.interfacedef,org.
- apache.tuscany.sca.core,org.apache.tuscany.sca.assembly,javax.xml.str
- eam,org.apache.tuscany.sca.interfacedef.java";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Java Implementation XML Model
-Bundle-Name: Apache Tuscany SCA Java Implementation XML Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml
-Tool: Bnd-0.0.255
+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 1638a991bc..ea810567fb 100644
--- a/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
@@ -1,6 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.java.introspect;
+ uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.impleme
+ ntation.java,org.osoa.sca";version="1.4",org.apache.tuscany.sca.imple
+ mentation.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tusc
+ any.sca.implementation.java.introspect,org.apache.tuscany.sca.core,or
+ g.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java"
+ ;version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.java.impl;versi
+ on="1.4",org.apache.tuscany.sca.implementation.java.introspect.impl;v
+ ersion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397153500
+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.jws,javax.xml.namespace,org.apache.tuscany.sca.a
  ssembly;version="1.4",org.apache.tuscany.sca.assembly.impl;version="1
  .4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.
@@ -9,24 +26,9 @@ Import-Package: javax.jws,javax.xml.namespace,org.apache.tuscany.sca.a
  version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4",
  org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache.tus
  cany.sca.policy;version="1.4",org.osoa.sca;version="1.4",org.osoa.sca
- .annotations;version="1.4"
-Bnd-LastModified: 1225317044168
-Export-Package: org.apache.tuscany.sca.implementation.java;uses:="org.
- apache.tuscany.sca.core,org.apache.tuscany.sca.implementation.java.in
- trospect,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.polic
- y,org.apache.tuscany.sca.interfacedef.java";version="1.4",org.apache.
- tuscany.sca.implementation.java.introspect;uses:="org.osoa.sca,org.ap
- ache.tuscany.sca.implementation.java,org.apache.tuscany.sca.assembly"
- ;version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Java Implementation Model
-Bundle-Description: Apache Tuscany SCA Java Implementation Model
-Private-Package: org.apache.tuscany.sca.implementation.java.impl;versi
- on="1.4",org.apache.tuscany.sca.implementation.java.introspect.impl;v
- ersion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ .annotations;version="1.4",junit.framework;resolution:=optional,org.a
+ pache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=op
+ tional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 2e6fed4d16..5d6d00c7d6 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
@@ -1,6 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.node.launcher;us
+ es:="org.apache.tuscany.sca.node,org.osoa.sca";version="1.4",org.apac
+ he.tuscany.sca.implementation.node.webapp;uses:="org.apache.tuscany.s
+ ca.implementation.node.launcher,org.apache.tuscany.sca.node,org.apach
+ e.tuscany.sca.core,javax.servlet,org.apache.tuscany.sca.host.http,jav
+ ax.servlet.http";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.node.provider;v
+ ersion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Node Implementation Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397409312
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Node Implementation Extension
 Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc
  a.assembly;version="1.4",org.apache.tuscany.sca.core;version="1.4",or
  g.apache.tuscany.sca.host.http;version="1.4",org.apache.tuscany.sca.i
@@ -10,23 +25,8 @@ 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"
-Bnd-LastModified: 1225317239149
-Export-Package: org.apache.tuscany.sca.implementation.node.webapp;uses
- :="javax.servlet.http,org.apache.tuscany.sca.host.http,org.apache.tus
- cany.sca.implementation.node.launcher,javax.servlet,org.apache.tuscan
- y.sca.node,org.apache.tuscany.sca.core";version="1.4",org.apache.tusc
- any.sca.implementation.node.launcher;uses:="org.apache.tuscany.sca.no
- de,org.osoa.sca";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Node Implementation Extension
-Bundle-Description: Apache Tuscany SCA Node Implementation Extension
-Private-Package: org.apache.tuscany.sca.implementation.node.provider;v
- ersion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ="1.4",junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node.runtim
  e
-Tool: Bnd-0.0.255
+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 1f83c1d25d..aefef7257f 100644
--- a/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
@@ -1,6 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.node;uses:="org.
+ apache.tuscany.sca.assembly";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.node.builder.im
+ pl;version="1.4",org.apache.tuscany.sca.implementation.node.impl;vers
+ ion="1.4",org.apache.tuscany.sca.implementation.node.xml;version="1.4
+ "
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Node Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -9,20 +22,11 @@ Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream
  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"
-Bnd-LastModified: 1225317072215
-Export-Package: org.apache.tuscany.sca.implementation.node;uses:="org.
- apache.tuscany.sca.assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Node Implementation Model
-Bundle-Description: Apache Tuscany SCA Node Implementation Model
-Private-Package: org.apache.tuscany.sca.implementation.node.builder.im
- pl;version="1.4",org.apache.tuscany.sca.implementation.node.impl;vers
- ion="1.4",org.apache.tuscany.sca.implementation.node.xml;version="1.4
- "
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node
-Tool: Bnd-0.0.255
+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 d9ee5ee267..dcdf18efa5 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
@@ -1,22 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.implementation.resource.provid
+ er;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Resource Implementation Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementati
  on.resource;version="1.4",org.apache.tuscany.sca.interfacedef;version
  ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus
  cany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;versio
- n="1.4"
-Bnd-LastModified: 1225317139541
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Resource Implementation Runtime
-Bundle-Name: Apache Tuscany SCA Resource Implementation Runtime
-Private-Package: org.apache.tuscany.sca.implementation.resource.provid
- er;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ n="1.4",junit.framework;resolution:=optional,org.apache.tuscany.sca.n
+ ode;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource.ru
  ntime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
index 075e9fdb44..189ea2a372 100644
--- a/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
@@ -1,6 +1,18 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.resource;uses:="
+ org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data.collectio
+ n";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.resource.impl;v
+ ersion="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Resource Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397272734
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Resource Implementation Model
 Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers
  ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"
@@ -10,18 +22,6 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  on="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache
  .tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.m
  onitor;version="1.4"
-Bnd-LastModified: 1225317138526
-Export-Package: org.apache.tuscany.sca.implementation.resource;uses:="
- org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data.collectio
- n";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Resource Implementation Model
-Bundle-Description: Apache Tuscany SCA Resource Implementation Model
-Private-Package: org.apache.tuscany.sca.implementation.resource.impl;v
- ersion="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 bff9bb295a..90f89d3fc6 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
@@ -1,6 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.script.provider;
+ uses:="org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runt
+ ime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.databindin
+ g.impl,org.apache.tuscany.sca.provider,org.apache.bsf.xml,org.apache.
+ tuscany.sca.core,org.apache.tuscany.sca.interfacedef.java,org.w3c.dom
+ ,javax.script,org.apache.tuscany.sca.interfacedef,javax.xml.namespace
+ ,org.apache.axiom.om,org.apache.tuscany.sca.implementation.script,org
+ .apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.factory,or
+ g.apache.tuscany.sca.interfacedef.wsdl";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.script.engines;
+ version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Script Implementation Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397459984
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Script Implementation Extension
 Import-Package: com.sun.script.jruby,javax.script,javax.xml.namespace,
  org.apache.axiom.om,org.apache.bsf.xml,org.apache.tuscany.sca.assembl
  y;version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.
@@ -15,26 +33,10 @@ Import-Package: com.sun.script.jruby,javax.script,javax.xml.namespace,
  e;version="1.4",org.jruby,org.jruby.ast,org.jruby.exceptions,org.jrub
  y.internal.runtime,org.jruby.javasupport,org.jruby.runtime,org.jruby.
  runtime.builtin,org.jruby.runtime.load,org.jruby.util,org.jruby.util.
- io,org.w3c.dom
-Bnd-LastModified: 1225317276961
-Export-Package: org.apache.tuscany.sca.implementation.script.provider;
- uses:="org.apache.tuscany.sca.databinding.impl,org.apache.tuscany.sca
- .invocation,javax.xml.namespace,org.w3c.dom,org.apache.tuscany.sca.in
- terfacedef.wsdl,javax.script,org.apache.tuscany.sca.core.factory,org.
- apache.tuscany.sca.runtime,org.apache.tuscany.sca.databinding,org.apa
- che.tuscany.sca.provider,org.apache.tuscany.sca.interfacedef,org.apac
- he.tuscany.sca.core,org.apache.axiom.om,org.apache.tuscany.sca.assemb
- ly,org.apache.bsf.xml,org.apache.tuscany.sca.implementation.script,or
- g.apache.tuscany.sca.interfacedef.java";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Script Implementation Extension
-Bundle-Description: Apache Tuscany SCA Script Implementation Extension
-Private-Package: org.apache.tuscany.sca.implementation.script.engines;
- version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ io,org.w3c.dom,org.osoa.sca.annotations;version="1.4";resolution:=opt
+ ional,junit.framework;resolution:=optional,org.apache.tuscany.sca.nod
+ e;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script.runt
  ime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
index 10264d5def..69baef9314 100644
--- a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.script;uses:="ja
+ vax.xml.stream,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca
+ .contribution.resolver,org.apache.tuscany.sca.contribution.processor,
+ org.apache.tuscany.sca.core,org.apache.tuscany.sca.contribution,org.a
+ pache.tuscany.sca.monitor,javax.xml.namespace";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Script Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397453750
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Script Implementation Model
 Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;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.script;version="1.4",org.apache.tuscany.sca.monitor;version="1.4"
-Bnd-LastModified: 1225317272179
-Export-Package: org.apache.tuscany.sca.implementation.script;uses:="ja
- vax.xml.namespace,org.apache.tuscany.sca.monitor,org.apache.tuscany.s
- ca.core,org.apache.tuscany.sca.contribution.resolver,org.apache.tusca
- ny.sca.assembly,org.apache.tuscany.sca.contribution,org.apache.tuscan
- y.sca.contribution.processor,javax.xml.stream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Script Implementation Model
-Bundle-Name: Apache Tuscany SCA Script Implementation Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ n.script;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 a376d4b00a..755debb4cb 100644
--- a/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
@@ -1,6 +1,34 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.spring;uses:="or
+ g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runtime,org.a
+ pache.tuscany.sca.provider,org.springframework.context.support,org.sp
+ ringframework.beans,org.apache.tuscany.sca.assembly.impl,org.springfr
+ amework.beans.factory.config,org.apache.tuscany.sca.core,org.apache.t
+ uscany.sca.policy,javax.xml.namespace,javax.xml.stream,org.apache.tus
+ cany.sca.interfacedef.java.impl,org.apache.tuscany.sca.assembly.xml,o
+ rg.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca.co
+ re.factory,org.apache.tuscany.sca.core.invocation,org.springframework
+ .beans.factory,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca
+ .databinding.impl,org.springframework.core.io,org.springframework.bea
+ ns.factory.xml,org.springframework.context,org.apache.tuscany.sca.imp
+ lementation.java,org.apache.tuscany.sca.interfacedef.java,org.apache.
+ tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.w3c.dom,o
+ rg.apache.tuscany.sca.implementation.java.injection,org.apache.tuscan
+ y.sca.invocation,org.apache.tuscany.sca.contribution.processor";versi
+ on="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
+ ion="1.4",org.springframework.sca.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Spring Framework Implementation Extens
+ ion
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397466437
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Spring Framework Implementation
+  Extension
 Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.impl;ver
  sion="1.4",org.apache.tuscany.sca.assembly.xml;version="1.4",org.apac
@@ -21,35 +49,9 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  a.runtime;version="1.4",org.springframework.beans,org.springframework
  .beans.factory,org.springframework.beans.factory.config,org.springfra
  mework.beans.factory.xml,org.springframework.context,org.springframew
- ork.context.support,org.springframework.core.io,org.w3c.dom
-Bnd-LastModified: 1225317281164
-Export-Package: org.apache.tuscany.sca.implementation.spring;uses:="or
- g.apache.tuscany.sca.monitor,javax.xml.namespace,org.apache.tuscany.s
- ca.contribution.resolver,org.springframework.context.support,org.apac
- he.tuscany.sca.core.invocation,org.apache.tuscany.sca.runtime,org.apa
- che.tuscany.sca.databinding,org.springframework.core.io,org.apache.tu
- scany.sca.assembly,org.springframework.beans.factory,javax.xml.stream
- ,org.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.data
- binding.impl,org.apache.tuscany.sca.invocation,org.w3c.dom,org.apache
- .tuscany.sca.implementation.java.injection,org.springframework.contex
- t,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.contribution.p
- rocessor,org.apache.tuscany.sca.assembly.xml,org.apache.tuscany.sca.c
- ore.factory,org.apache.tuscany.sca.provider,org.springframework.beans
- .factory.config,org.springframework.beans.factory.xml,org.apache.tusc
- any.sca.interfacedef.java.impl,org.apache.tuscany.sca.implementation.
- java,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,
- org.springframework.beans,org.apache.tuscany.sca.assembly.impl";versi
- on="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Spring Framework Implementation Extens
- ion
-Bundle-Description: Apache Tuscany SCA Spring Framework Implementation
-  Extension
-Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
- ion="1.4",org.springframework.sca.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ork.context.support,org.springframework.core.io,org.w3c.dom,org.osoa.
+ sca.annotations;version="1.4";resolution:=optional,junit.framework;re
+ solution:=optional,org.apache.tuscany.sca.node;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.spring
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 87eccf4ed8..29cf3fab66 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
@@ -1,22 +1,27 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.implementation.widget.provider
+ ;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Widget Implementation Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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: org.apache.tuscany.sca.assembly;version="1.4",org.apac
  he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementati
  on.widget;version="1.4",org.apache.tuscany.sca.interfacedef;version="
  1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tusca
  ny.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;version=
- "1.4",org.w3c.dom
-Bnd-LastModified: 1225317244274
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Widget Implementation Runtime
-Bundle-Name: Apache Tuscany SCA Widget Implementation Runtime
-Private-Package: org.apache.tuscany.sca.implementation.widget.provider
- ;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ "1.4",org.w3c.dom,org.apache.abdera.factory;resolution:=optional,org.
+ apache.tuscany.sca.binding.atom.collection;resolution:=optional,org.o
+ soa.sca.annotations;version="1.4";resolution:=optional,junit.framewor
+ k;resolution:=optional,org.apache.abdera.model;resolution:=optional,o
+ rg.apache.tuscany.sca.node;resolution:=optional,org.apache.abdera;res
+ olution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt
  ime
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
index c6de8fa728..8ee8107efc 100644
--- a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
@@ -1,6 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.widget;uses:="or
+ g.apache.tuscany.sca.data.collection,org.apache.tuscany.sca.assembly,
+ org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.core,org.a
+ pache.tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef.java,or
+ g.apache.tuscany.sca.interfacedef,javax.xml.namespace,javax.xml.strea
+ m,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca
+ .contribution.processor";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Widget Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397413234
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Widget Implementation Model
 Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers
  ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"
@@ -10,20 +24,6 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  ="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.t
  uscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.mon
  itor;version="1.4"
-Bnd-LastModified: 1225317242727
-Export-Package: org.apache.tuscany.sca.implementation.widget;uses:="ja
- vax.xml.namespace,org.apache.tuscany.sca.monitor,org.apache.tuscany.s
- ca.contribution.resolver,org.apache.tuscany.sca.contribution,org.apac
- he.tuscany.sca.contribution.processor,org.apache.tuscany.sca.interfac
- edef,org.apache.tuscany.sca.core,org.apache.tuscany.sca.assembly,org.
- apache.tuscany.sca.data.collection,javax.xml.stream,org.apache.tuscan
- y.sca.interfacedef.java";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Widget Implementation Model
-Bundle-Name: Apache Tuscany SCA Widget Implementation Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
index 1c7018e1f4..ab2b0d1206 100644
--- a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
@@ -1,6 +1,28 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.xquery;uses:="or
+ g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runtime,net.s
+ f.saxon.value,org.apache.tuscany.sca.interfacedef.util,org.apache.tus
+ cany.sca.provider,org.apache.tuscany.sca.databinding.saxon,net.sf.sax
+ on.trans,org.apache.tuscany.sca.core,javax.xml.transform.dom,net.sf.s
+ axon,org.apache.tuscany.sca.databinding.saxon.collection,javax.xml.na
+ mespace,net.sf.saxon.query,org.apache.tuscany.sca.core.factory,net.sf
+ .saxon.om,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data
+ binding.impl,org.apache.tuscany.sca.interfacedef.java,org.apache.tusc
+ any.sca.interfacedef,org.w3c.dom,org.apache.tuscany.sca.implementatio
+ n.java.injection,org.apache.tuscany.sca.invocation,javax.xml.transfor
+ m,net.sf.saxon.event,javax.xml.transform.stream";version="1.4"
+Private-Package: org.apache.tuscany.sca.implementation.xquery.impl;ver
+ sion="1.4",org.apache.tuscany.sca.implementation.xquery.xml;version="
+ 1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA XQuery Implementation Extension
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397469781
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA XQuery Implementation Extension
 Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.transfo
  rm,javax.xml.transform.dom,javax.xml.transform.stream,net.sf.saxon,ne
  t.sf.saxon.event,net.sf.saxon.om,net.sf.saxon.query,net.sf.saxon.tran
@@ -20,28 +42,6 @@ Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.transfo
  he.tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monito
  r;version="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apa
  che.tuscany.sca.runtime;version="1.4",org.w3c.dom
-Bnd-LastModified: 1225317284085
-Export-Package: org.apache.tuscany.sca.implementation.xquery;uses:="or
- g.apache.tuscany.sca.databinding.saxon.collection,javax.xml.namespace
- ,net.sf.saxon.query,net.sf.saxon.om,net.sf.saxon.event,javax.xml.tran
- sform,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.databindi
- ng,net.sf.saxon.trans,javax.xml.transform.stream,net.sf.saxon.value,o
- rg.apache.tuscany.sca.assembly,org.apache.tuscany.sca.interfacedef.ja
- va,org.apache.tuscany.sca.databinding.impl,org.apache.tuscany.sca.dat
- abinding.saxon,org.apache.tuscany.sca.invocation,org.apache.tuscany.s
- ca.interfacedef.util,org.w3c.dom,org.apache.tuscany.sca.implementatio
- n.java.injection,org.apache.tuscany.sca.core.factory,javax.xml.transf
- orm.dom,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.interf
- acedef,net.sf.saxon,org.apache.tuscany.sca.core";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA XQuery Implementation Extension
-Bundle-Description: Apache Tuscany SCA XQuery Implementation Extension
-Private-Package: org.apache.tuscany.sca.implementation.xquery.impl;ver
- sion="1.4",org.apache.tuscany.sca.implementation.xquery.xml;version="
- 1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 9397c5c8ca..f9e3696f6a 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
@@ -1,6 +1,22 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.interfacedef.java.jaxws;uses:="
+ org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacede
+ f.util,org.objectweb.asm,javax.jws,javax.xml.namespace,javax.jws.soap
+ ,org.apache.tuscany.sca.interfacedef.java.impl,org.apache.tuscany.sca
+ .databinding.annotation,org.osoa.sca,javax.xml.bind.annotation.adapte
+ rs,org.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.in
+ terfacedef,org.apache.tuscany.sca.interfacedef.java.introspect,javax.
+ xml.bind.annotation,org.apache.tuscany.sca.databinding.jaxb,org.apach
+ e.tuscany.sca.interfacedef.impl,javax.xml.ws";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Java Interface for JAXWS
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397232156
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany Java Interface for JAXWS
 Import-Package: javax.jws,javax.jws.soap,javax.xml.bind.annotation,jav
  ax.xml.bind.annotation.adapters,javax.xml.namespace,javax.xml.ws,org.
  apache.tuscany.sca.databinding;version="1.4",org.apache.tuscany.sca.d
@@ -11,23 +27,12 @@ Import-Package: javax.jws,javax.jws.soap,javax.xml.bind.annotation,jav
  erfacedef.java.impl;version="1.4",org.apache.tuscany.sca.interfacedef
  .java.introspect;version="1.4",org.apache.tuscany.sca.interfacedef.ja
  va.jaxws;version="1.4",org.apache.tuscany.sca.interfacedef.util;versi
- on="1.4",org.objectweb.asm;version="3.1",org.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317096886
-Export-Package: org.apache.tuscany.sca.interfacedef.java.jaxws;uses:="
- javax.xml.namespace,javax.xml.bind.annotation.adapters,org.apache.tus
- cany.sca.databinding,javax.xml.ws,org.apache.tuscany.sca.databinding.
- jaxb,org.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.
- interfacedef.impl,org.apache.tuscany.sca.interfacedef.util,javax.xml.
- bind.annotation,org.apache.tuscany.sca.interfacedef.java.introspect,o
- rg.objectweb.asm,org.apache.tuscany.sca.databinding.annotation,javax.
- jws.soap,org.apache.tuscany.sca.interfacedef.java.impl,org.osoa.sca,o
- rg.apache.tuscany.sca.interfacedef,javax.jws";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Java Interface for JAXWS
-Bundle-Name: Apache Tuscany Java Interface for JAXWS
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ on="1.4",org.objectweb.asm;version="3.1",org.osoa.sca;version="1.4",j
+ unit.framework;resolution:=optional,org.objectweb.asm.util;version="3
+ .1";resolution:=optional,org.osoa.sca.annotations;version="1.4";resol
+ ution:=optional,org.junit;resolution:=optional,javax.xml.transform;re
+ solution:=optional,javax.xml.transform.stream;resolution:=optional,ja
+ vax.xml.bind;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 0df3e4ecbb..6b733ead34 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
@@ -1,21 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.interfacedef.java.xml;version=
+ "1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Interface XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397167906
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Java Interface XML Model
 Import-Package: javax.xml.namespace,javax.xml.stream,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.interfacedef;version="1.4",org.apache.tu
  scany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.moni
- tor;version="1.4"
-Bnd-LastModified: 1225317055996
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Java Interface XML Model
-Bundle-Name: Apache Tuscany SCA Java Interface XML Model
-Private-Package: org.apache.tuscany.sca.interfacedef.java.xml;version=
- "1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ tor;version="1.4",org.apache.tuscany.sca.assembly;version="1.4";resol
+ ution:=optional,org.apache.tuscany.sca.definitions;version="1.4";reso
+ lution:=optional,org.junit;resolution:=optional,org.apache.tuscany.sc
+ a.assembly.builder;version="1.4";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.xml
-Tool: Bnd-0.0.255
+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 99e3ba8133..358bf00869 100644
--- a/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
@@ -1,6 +1,26 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.interfacedef.java.impl;uses:="o
+ rg.osoa.sca.annotations,org.apache.tuscany.sca.interfacedef.util,org.
+ apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java,or
+ g.apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apache.tusc
+ any.sca.interfacedef.java.introspect,org.apache.tuscany.sca.interface
+ def.impl";version="1.4",org.apache.tuscany.sca.interfacedef.java.intr
+ ospect;uses:="org.apache.tuscany.sca.interfacedef.java,org.apache.tus
+ cany.sca.interfacedef";version="1.4",org.apache.tuscany.sca.interface
+ def.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sc
+ a.interfacedef.java.impl,org.apache.tuscany.sca.interfacedef.java.int
+ rospect,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy,org
+ .apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.extensibility
+ ,javax.xml.namespace";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java Interface Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -9,27 +29,8 @@ Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
  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"
-Bnd-LastModified: 1225317032715
-Export-Package: org.apache.tuscany.sca.interfacedef.java.impl;uses:="o
- rg.osoa.sca.annotations,org.apache.tuscany.sca.interfacedef.impl,java
- x.xml.namespace,org.apache.tuscany.sca.interfacedef.util,org.apache.t
- uscany.sca.interfacedef.java.introspect,org.apache.tuscany.sca.policy
- ,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.interface
- def.java";version="1.4",org.apache.tuscany.sca.interfacedef.java.intr
- ospect;uses:="org.apache.tuscany.sca.interfacedef,org.apache.tuscany.
- sca.interfacedef.java";version="1.4",org.apache.tuscany.sca.interface
- def.java;uses:="org.apache.tuscany.sca.extensibility,org.apache.tusca
- ny.sca.interfacedef.java.impl,javax.xml.namespace,org.apache.tuscany.
- sca.interfacedef,org.apache.tuscany.sca.core,org.apache.tuscany.sca.a
- ssembly,org.apache.tuscany.sca.interfacedef.java.introspect,org.apach
- e.tuscany.sca.policy";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Java Interface Model
-Bundle-Name: Apache Tuscany SCA Java Interface Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ="1.4",org.osoa.sca.annotations;version="1.4",junit.framework;resolut
+ ion:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java
-Tool: Bnd-0.0.255
+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 4e98ddd5fe..a41df60f4b 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
@@ -1,6 +1,15 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.xml;version=
+ "1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA WSDL Interface XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397292156
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA WSDL Interface XML Model
 Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions
  .schema,javax.wsdl.factory,javax.wsdl.xml,javax.xml.namespace,javax.x
  ml.stream,org.apache.tuscany.sca.contribution;version="1.4",org.apach
@@ -11,16 +20,15 @@ Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions
  cany.sca.interfacedef.wsdl;version="1.4",org.apache.tuscany.sca.monit
  or;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apache.
  tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema,org.w3
- c.dom,org.xml.sax
-Bnd-LastModified: 1225317150432
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA WSDL Interface XML Model
-Bundle-Name: Apache Tuscany SCA WSDL Interface XML Model
-Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.xml;version=
- "1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ c.dom,org.xml.sax,org.apache.tuscany.sca.interfacedef.util;version="1
+ .4";resolution:=optional,org.apache.tuscany.sca.definitions;version="
+ 1.4";resolution:=optional,org.apache.tuscany.sca.interfacedef.wsdl.im
+ pl;resolution:=optional,org.apache.tuscany.sca.policy;version="1.4";r
+ esolution:=optional,junit.framework;resolution:=optional,org.apache.t
+ uscany.sca.assembly.builder;version="1.4";resolution:=optional,org.ap
+ ache.tuscany.sca.assembly;version="1.4";resolution:=optional,org.apac
+ he.tuscany.sca.assembly.builder.impl;resolution:=optional,org.junit;r
+ esolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 34e11111a6..06f9fee31c 100644
--- a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
@@ -1,6 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.interfacedef.wsdl;uses:="org.ap
+ ache.ws.commons.schema,org.apache.tuscany.sca.assembly,org.apache.tus
+ cany.sca.contribution.resolver,javax.wsdl.extensions,org.apache.tusca
+ ny.sca.core,org.apache.tuscany.sca.interfacedef,javax.wsdl,javax.xml.
+ namespace";version="1.4"
+Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.impl;version
+ ="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA WSDL Interface Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397282593
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA WSDL Interface Model
 Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,o
  rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.c
  ontribution.resolver;version="1.4",org.apache.tuscany.sca.core;versio
@@ -9,20 +23,6 @@ Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,o
  terfacedef.util;version="1.4",org.apache.tuscany.sca.interfacedef.wsd
  l;version="1.4",org.apache.tuscany.sca.policy;version="1.4",org.apach
  e.tuscany.sca.xsd;version="1.4",org.apache.ws.commons.schema
-Bnd-LastModified: 1225317144682
-Export-Package: org.apache.tuscany.sca.interfacedef.wsdl;uses:="javax.
- wsdl,javax.wsdl.extensions,org.apache.ws.commons.schema,javax.xml.nam
- espace,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.cor
- e,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca
- .assembly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA WSDL Interface Model
-Bundle-Description: Apache Tuscany SCA WSDL Interface Model
-Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.impl;version
- ="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl
-Tool: Bnd-0.0.255
+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 8e9d9d28cd..9f2f1ed59c 100644
--- a/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.interfacedef.util;uses:="javax.
+ xml.transform,org.apache.tuscany.sca.interfacedef.impl,org.apache.tus
+ cany.sca.interfacedef,javax.xml.datatype,javax.xml.namespace";version
+ ="1.4",org.apache.tuscany.sca.interfacedef.impl;uses:="org.apache.tus
+ cany.sca.interfacedef.util,org.apache.tuscany.sca.policy,org.apache.t
+ uscany.sca.interfacedef";version="1.4",org.apache.tuscany.sca.interfa
+ cedef;uses:="org.apache.tuscany.sca.interfacedef.util,org.apache.tusc
+ any.sca.policy";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Interface Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397086703
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Interface Model
 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
- "
-Bnd-LastModified: 1225316998857
-Export-Package: org.apache.tuscany.sca.interfacedef.impl;uses:="org.ap
- ache.tuscany.sca.interfacedef,org.apache.tuscany.sca.interfacedef.uti
- l,org.apache.tuscany.sca.policy";version="1.4",org.apache.tuscany.sca
- .interfacedef;uses:="org.apache.tuscany.sca.interfacedef.util,org.apa
- che.tuscany.sca.policy";version="1.4",org.apache.tuscany.sca.interfac
- edef.util;uses:="org.apache.tuscany.sca.interfacedef.impl,javax.xml.n
- amespace,org.apache.tuscany.sca.interfacedef,javax.xml.datatype,javax
- .xml.transform";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Interface Model
-Bundle-Name: Apache Tuscany SCA Interface Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ",junit.framework;resolution:=optional,org.apache.tuscany.sca.core;ve
+ rsion="1.4";resolution:=optional,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface
-Tool: Bnd-0.0.255
+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 1917ae72c8..19a6b00a2d 100644
--- a/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
@@ -1,16 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.monitor;version="1.4"
-Bnd-LastModified: 1225317002357
 Export-Package: org.apache.tuscany.sca.monitor;version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Monitor
-Bundle-Description: Apache Tuscany SCA Monitor
 Private-Package: org.apache.tuscany.sca.monitor.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Monitor
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.monitor
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
index e2cff11494..077bca13a3 100644
--- a/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.node;version="1.4",org.osoa.sca
- ;version="1.4"
-Bnd-LastModified: 1225317068840
 Export-Package: org.apache.tuscany.sca.node;uses:="org.osoa.sca";versi
  on="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Node API
-Bundle-Description: Apache Tuscany SCA Node API
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-SymbolicName: org.apache.tuscany.sca.node.api
 Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Node API
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 DynamicImport-Package: org.apache.tuscany.sca.node.impl,org.apache.tus
  cany.sca.extensibility
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397189093
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Node API
+Import-Package: org.apache.tuscany.sca.node;version="1.4",org.osoa.sca
+ ;version="1.4"
+Bundle-SymbolicName: org.apache.tuscany.sca.node.api
+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 98a82b90d1..c39a3fb99d 100644
--- a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
@@ -1,6 +1,24 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.node.impl;uses:="org.apache.tus
+ cany.sca.runtime,org.apache.tuscany.sca.definitions,org.apache.tuscan
+ y.sca.core,javax.xml.namespace,javax.xml.stream,org.apache.tuscany.sc
+ a.core.assembly,org.apache.tuscany.sca.contribution.resolver,org.apac
+ he.tuscany.sca.workspace,org.apache.tuscany.sca.core.invocation,org.o
+ soa.sca,org.apache.tuscany.sca.assembly.builder,org.apache.tuscany.sc
+ a.implementation.node,org.apache.tuscany.sca.assembly,org.apache.tusc
+ any.sca.node,org.apache.tuscany.sca.workspace.builder,org.apache.tusc
+ any.sca.contribution,org.apache.tuscany.sca.monitor,org.apache.tuscan
+ y.sca.work,org.apache.tuscany.sca.contribution.processor";version="1.
+ 4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Node Implementation
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397240796
+Bundle-ManifestVersion: 2
 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,org.apache.tuscan
  y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;
  version="1.4",org.apache.tuscany.sca.contribution;version="1.4",org.a
@@ -14,25 +32,9 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  pl;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa
  che.tuscany.sca.work;version="1.4",org.apache.tuscany.sca.workspace;v
  ersion="1.4",org.apache.tuscany.sca.workspace.builder;version="1.4",o
- rg.osoa.sca;version="1.4"
-Bnd-LastModified: 1225317108417
-Export-Package: org.apache.tuscany.sca.node.impl;uses:="javax.xml.name
- space,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.contribut
- ion.resolver,org.apache.tuscany.sca.contribution,org.apache.tuscany.s
- ca.core.invocation,org.apache.tuscany.sca.runtime,org.apache.tuscany.
- sca.definitions,org.apache.tuscany.sca.assembly,javax.xml.stream,org.
- apache.tuscany.sca.workspace,org.apache.tuscany.sca.work,org.apache.t
- uscany.sca.core.assembly,org.apache.tuscany.sca.workspace.builder,org
- .apache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.ass
- embly.builder,org.apache.tuscany.sca.node,org.osoa.sca,org.apache.tus
- cany.sca.core,org.apache.tuscany.sca.implementation.node";version="1.
- 4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Node Implementation
-Bundle-Name: Apache Tuscany SCA Node Implementation
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ rg.osoa.sca;version="1.4",org.osoa.sca.annotations;version="1.4";reso
+ lution:=optional,junit.framework;resolution:=optional,org.junit;resol
+ ution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 8d3fded4fb..810457b8b5 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
@@ -1,19 +1,21 @@
 Manifest-Version: 1.0
-Eclipse-AutoStart: true
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.tuscany.sca.node.equinox.launcher;version="
- 1.4",org.eclipse.core.runtime.adaptor,org.osgi.framework;version="1.4
- "
-Bnd-LastModified: 1225317286398
 Export-Package: org.apache.tuscany.sca.node.equinox.launcher;uses:="or
  g.osgi.framework,org.eclipse.core.runtime.adaptor";version="1.4"
-Bundle-Version: 1.4
+Eclipse-AutoStart: true
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Node Equinox OSGi Launcher
-Bundle-Description: Apache Tuscany SCA Node Equinox OSGi Launcher
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
 Bundle-SymbolicName: org.apache.tuscany.sca.node.launcher.equinox
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
index 89ed7da679..6827dde638 100644
--- a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: javax.servlet,org.apache.tuscany.sca.node.launcher;ver
- sion="1.4"
-Bnd-LastModified: 1225317237461
 Export-Package: org.apache.tuscany.sca.node.launcher;uses:="javax.serv
  let";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Node Launcher
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Node Launcher
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397407125
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Node Launcher
+Import-Package: javax.servlet,org.apache.tuscany.sca.node.launcher;ver
+ sion="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.node.launcher
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
index b000510578..4bd395d6f6 100644
--- a/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.implementation.node.manager;use
+ s:="javax.servlet,org.osoa.sca.annotations,org.apache.tuscany.sca.dat
+ a.collection,org.apache.tuscany.sca.node.launcher,javax.xml.parsers,o
+ rg.osoa.sca,javax.servlet.http";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Node Manager Application
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397411859
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Node Manager Application
 Import-Package: javax.servlet,javax.servlet.http,javax.xml.parsers,org
  .apache.tuscany.sca.data.collection;version="1.4",org.apache.tuscany.
  sca.implementation.node.manager;version="1.4",org.apache.tuscany.sca.
  node.launcher;version="1.4",org.osoa.sca;version="1.4",org.osoa.sca.a
  nnotations;version="1.4"
-Bnd-LastModified: 1225317241102
-Export-Package: org.apache.tuscany.sca.implementation.node.manager;use
- s:="javax.servlet.http,javax.servlet,org.osoa.sca.annotations,javax.x
- ml.parsers,org.osoa.sca,org.apache.tuscany.sca.node.launcher,org.apac
- he.tuscany.sca.data.collection";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Node Manager Application
-Bundle-Name: Apache Tuscany SCA Node Manager Application
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.node.manager
-Tool: Bnd-0.0.255
+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 0113020be8..4e9d422695 100644
--- a/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
@@ -1,6 +1,15 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.policy.logging;version="1.4",o
+ rg.apache.tuscany.sca.policy.logging.jdk;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Logging Policy Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -9,16 +18,8 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  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"
-Bnd-LastModified: 1225317290757
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Logging Policy Model
-Bundle-Name: Apache Tuscany Logging Policy Model
-Private-Package: org.apache.tuscany.sca.policy.logging;version="1.4",o
- rg.apache.tuscany.sca.policy.logging.jdk;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ tuscany.sca.runtime;version="1.4",junit.framework;resolution:=optiona
+ l
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.logging
-Tool: Bnd-0.0.255
+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 94d45c6cd6..9c1010e56c 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
@@ -1,22 +1,28 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.policy.jsr250;version="1.4",or
+ g.apache.tuscany.sca.policy.jsr250.introspect.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Java JSR250 Implementation
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397483046
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Java JSR250 Implementation
 Import-Package: javax.annotation.security,javax.xml.namespace,org.apac
  he.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.core;ver
  sion="1.4",org.apache.tuscany.sca.implementation.java;version="1.4",o
  rg.apache.tuscany.sca.implementation.java.introspect;version="1.4",or
  g.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.poli
  cy.authorization;version="1.4",org.apache.tuscany.sca.policy.identity
- ;version="1.4"
-Bnd-LastModified: 1225317292335
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Java JSR250 Implementation
-Bundle-Name: Apache Tuscany SCA Java JSR250 Implementation
-Private-Package: org.apache.tuscany.sca.policy.jsr250;version="1.4",or
- g.apache.tuscany.sca.policy.jsr250.introspect.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ;version="1.4",org.apache.tuscany.sca.implementation.java.introspect.
+ 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
+ ache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=opt
+ ional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.jsr250
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 f8493b5f70..f1b52c5586 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
@@ -1,6 +1,22 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.policy.security.ws;uses:="org.a
+ pache.axis2,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.ass
+ embly,org.apache.neethi,org.apache.tuscany.sca.provider,org.apache.tu
+ scany.sca.core,org.apache.axis2.context,org.apache.tuscany.sca.monito
+ r,org.apache.tuscany.sca.policy,javax.xml.namespace,org.apache.axiom.
+ om,org.apache.axis2.description,javax.xml.stream,org.apache.axis2.eng
+ ine,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.s
+ ca.policy.util,org.apache.tuscany.sca.contribution.processor,org.osoa
+ .sca";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Security Policy WS Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
@@ -11,23 +27,8 @@ Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver
  .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"
-Bnd-LastModified: 1225317157229
-Export-Package: org.apache.tuscany.sca.policy.security.ws;uses:="org.a
- pache.axis2.description,org.apache.axis2.engine,org.apache.axis2.cont
- ext,javax.xml.namespace,org.apache.tuscany.sca.monitor,org.apache.tus
- cany.sca.contribution.resolver,org.apache.tuscany.sca.policy,org.apac
- he.tuscany.sca.contribution.processor,org.apache.axis2,org.apache.tus
- cany.sca.runtime,org.apache.neethi,org.apache.tuscany.sca.provider,or
- g.osoa.sca,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy.
- util,org.apache.axiom.om,org.apache.tuscany.sca.assembly,javax.xml.st
- ream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Security Policy WS Model
-Bundle-Name: Apache Tuscany Security Policy WS Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ;version="1.4",org.osoa.sca;version="1.4",junit.framework;resolution:
+ =optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.ws
-Tool: Bnd-0.0.255
+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 f1607ae31a..a3d2827c93 100644
--- a/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
@@ -1,6 +1,40 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.policy.authorization;uses:="jav
+ ax.xml.stream,org.apache.tuscany.sca.contribution.resolver,org.apache
+ .tuscany.sca.contribution.processor,org.apache.tuscany.sca.core,org.a
+ pache.tuscany.sca.monitor,org.apache.tuscany.sca.policy,javax.xml.nam
+ espace";version="1.4",org.apache.tuscany.sca.policy.security.jaas;use
+ s:="javax.security.auth.callback,org.apache.tuscany.sca.runtime,org.a
+ pache.tuscany.sca.assembly,org.apache.tuscany.sca.provider,javax.secu
+ rity.auth.login,org.apache.tuscany.sca.core,org.apache.tuscany.sca.mo
+ nitor,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfaced
+ ef,javax.xml.namespace,org.apache.tuscany.sca.invocation,javax.xml.st
+ ream,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.
+ sca.policy.util,org.apache.tuscany.sca.contribution.processor,org.oso
+ a.sca";version="1.4",org.apache.tuscany.sca.policy.authentication.bas
+ ic;uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assem
+ bly,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.core,org.a
+ pache.tuscany.sca.policy,org.apache.tuscany.sca.monitor,org.apache.tu
+ scany.sca.interfacedef,javax.xml.namespace,org.apache.tuscany.sca.inv
+ ocation,javax.xml.stream,org.apache.tuscany.sca.contribution.resolver
+ ,org.apache.tuscany.sca.contribution.processor";version="1.4",org.apa
+ che.tuscany.sca.policy.security;uses:="org.apache.tuscany.sca.definit
+ ions.util,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.defi
+ nitions,org.apache.tuscany.sca.contribution.processor,org.apache.tusc
+ any.sca.core";version="1.4",org.apache.tuscany.sca.policy.identity;us
+ es:="javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,or
+ g.apache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.co
+ re,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.policy,javax
+ .xml.namespace";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany Security Policy Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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=
@@ -16,41 +50,8 @@ Import-Package: javax.security.auth.callback,javax.security.auth.login
  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"
-Bnd-LastModified: 1225317153307
-Export-Package: org.apache.tuscany.sca.policy.authentication.basic;use
- s:="org.apache.tuscany.sca.invocation,javax.xml.namespace,org.apache.
- tuscany.sca.monitor,org.apache.tuscany.sca.contribution.resolver,org.
- apache.tuscany.sca.policy,org.apache.tuscany.sca.contribution.process
- or,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.provider,org
- .apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,org.apac
- he.tuscany.sca.assembly,javax.xml.stream";version="1.4",org.apache.tu
- scany.sca.policy.security.jaas;uses:="javax.security.auth.login,org.a
- pache.tuscany.sca.invocation,org.apache.tuscany.sca.monitor,javax.xml
- .namespace,org.apache.tuscany.sca.contribution.resolver,org.apache.tu
- scany.sca.policy,org.apache.tuscany.sca.contribution.processor,org.ap
- ache.tuscany.sca.runtime,org.apache.tuscany.sca.provider,org.osoa.sca
- ,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.core,org.
- apache.tuscany.sca.policy.util,org.apache.tuscany.sca.assembly,javax.
- xml.stream,javax.security.auth.callback";version="1.4",org.apache.tus
- cany.sca.policy.authorization;uses:="org.apache.tuscany.sca.monitor,j
- avax.xml.namespace,org.apache.tuscany.sca.core,org.apache.tuscany.sca
- .contribution.resolver,org.apache.tuscany.sca.policy,javax.xml.stream
- ,org.apache.tuscany.sca.contribution.processor";version="1.4",org.apa
- che.tuscany.sca.policy.identity;uses:="org.apache.tuscany.sca.monitor
- ,javax.xml.namespace,org.apache.tuscany.sca.core,org.apache.tuscany.s
- ca.contribution.resolver,org.apache.tuscany.sca.policy,javax.xml.stre
- am,org.apache.tuscany.sca.contribution.processor";version="1.4",org.a
- pache.tuscany.sca.policy.security;uses:="org.apache.tuscany.sca.provi
- der,org.apache.tuscany.sca.core,org.apache.tuscany.sca.definitions,or
- g.apache.tuscany.sca.definitions.util,org.apache.tuscany.sca.contribu
- tion.processor";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany Security Policy Model
-Bundle-Name: Apache Tuscany Security Policy Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ osoa.sca;version="1.4",junit.framework;resolution:=optional,org.junit
+ ;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security
-Tool: Bnd-0.0.255
+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 b97d265165..6fccae51ba 100644
--- a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
@@ -1,6 +1,23 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.policy.transaction;uses:="org.a
+ pache.tuscany.sca.runtime,org.apache.geronimo.transaction.log,org.apa
+ che.tuscany.sca.assembly,org.apache.tuscany.sca.provider,org.apache.t
+ uscany.sca.definitions,org.apache.tuscany.sca.core,org.apache.tuscany
+ .sca.monitor,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.int
+ erfacedef,javax.xml.namespace,org.apache.tuscany.sca.definitions.util
+ ,org.apache.tuscany.sca.invocation,javax.xml.stream,org.apache.tuscan
+ y.sca.contribution.resolver,javax.transaction,org.apache.tuscany.sca.
+ contribution.processor,org.apache.geronimo.transaction.manager";versi
+ on="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Transaction Policy Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397486843
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Transaction Policy Model
 Import-Package: javax.transaction;version="1.0.1",javax.xml.namespace,
  javax.xml.stream,org.apache.geronimo.transaction.log,org.apache.geron
  imo.transaction.manager,org.apache.tuscany.sca.assembly;version="1.4"
@@ -12,24 +29,9 @@ Import-Package: javax.transaction;version="1.0.1",javax.xml.namespace,
  ion;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.ap
  ache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.policy.t
  ransaction;version="1.4",org.apache.tuscany.sca.provider;version="1.4
- ",org.apache.tuscany.sca.runtime;version="1.4"
-Bnd-LastModified: 1225317295320
-Export-Package: org.apache.tuscany.sca.policy.transaction;uses:="org.a
- pache.geronimo.transaction.manager,org.apache.tuscany.sca.invocation,
- org.apache.tuscany.sca.monitor,javax.xml.namespace,org.apache.tuscany
- .sca.contribution.resolver,org.apache.geronimo.transaction.log,org.ap
- ache.tuscany.sca.policy,org.apache.tuscany.sca.definitions.util,org.a
- pache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.runti
- me,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.interfacede
- f,org.apache.tuscany.sca.core,org.apache.tuscany.sca.assembly,org.apa
- che.tuscany.sca.definitions,javax.transaction,javax.xml.stream";versi
- on="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Transaction Policy Model
-Bundle-Name: Apache Tuscany SCA Transaction Policy Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ",org.apache.tuscany.sca.runtime;version="1.4",junit.framework;resolu
+ tion:=optional,javax.transaction.xa;version="1.1";resolution:=optiona
+ l
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
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 681c8d1d0e..f9bc4eaa4b 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
@@ -1,19 +1,21 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.policy.xml.ws;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Policy XML WS Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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"
-Bnd-LastModified: 1225317025606
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Policy XML WS Model
-Bundle-Name: Apache Tuscany SCA Policy XML WS Model
-Private-Package: org.apache.tuscany.sca.policy.xml.ws;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml.ws
-Tool: Bnd-0.0.255
+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 0c8f701d07..0e2c35de0e 100644
--- a/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.policy.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Policy XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397115375
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Policy XML Model
 Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.xpath,o
  rg.apache.tuscany.sca.contribution.processor;version="1.4",org.apache
  .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"
-Bnd-LastModified: 1225317020887
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Policy XML Model
-Bundle-Name: Apache Tuscany SCA Policy XML Model
-Private-Package: org.apache.tuscany.sca.policy.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ cy.impl;version="1.4",junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml
-Tool: Bnd-0.0.255
+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 517d7ac849..8f86503a09 100644
--- a/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.policy.util;uses:="javax.xml.pa
+ rsers,javax.xml.transform.dom,org.apache.tuscany.sca.policy,org.apach
+ e.tuscany.sca.extensibility,org.w3c.dom,javax.xml.namespace,javax.xml
+ .xpath,javax.xml.transform,javax.xml.transform.stream";version="1.4",
+ org.apache.tuscany.sca.policy.impl;uses:="javax.xml.xpath,org.apache.
+ tuscany.sca.policy,javax.xml.namespace";version="1.4",org.apache.tusc
+ any.sca.policy;uses:="javax.xml.xpath,org.apache.tuscany.sca.policy.i
+ mpl,javax.xml.namespace";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Policy Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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
-Bnd-LastModified: 1225316995154
-Export-Package: org.apache.tuscany.sca.policy.impl;uses:="javax.xml.na
- mespace,javax.xml.xpath,org.apache.tuscany.sca.policy";version="1.4",
- org.apache.tuscany.sca.policy.util;uses:="org.apache.tuscany.sca.exte
- nsibility,javax.xml.namespace,org.w3c.dom,org.apache.tuscany.sca.poli
- cy,javax.xml.xpath,javax.xml.transform,javax.xml.transform.dom,javax.
- xml.parsers,javax.xml.transform.stream";version="1.4",org.apache.tusc
- any.sca.policy;uses:="javax.xml.namespace,org.apache.tuscany.sca.poli
- cy.impl,javax.xml.xpath";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Policy Model
-Bundle-Name: Apache Tuscany SCA Policy Model
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ n="1.4",org.apache.tuscany.sca.policy.util;version="1.4",org.w3c.dom,
+ junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
index f241c130bf..d0585ad7d4 100644
--- a/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: javax.security.auth,org.osoa.sca;version="1.4",org.oso
- a.sca.annotations;version="1.4"
-Bnd-LastModified: 1225317012606
 Export-Package: org.osoa.sca.annotations;version="1.4",org.osoa.sca;us
  es:="javax.security.auth";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: API classes for the Service Component Architecture
+Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA API
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397105046
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: API classes for the Service Component Architecture
+Import-Package: javax.security.auth,org.osoa.sca;version="1.4",org.oso
+ a.sca.annotations;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.api
-Tool: Bnd-0.0.255
+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 16e072980d..768d4f7228 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
@@ -1,10 +1,13 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.aspectj.lang,org.aspectj.lang.annotation,org.aspec
- tj.lang.reflect
-Bnd-LastModified: 1225317297007
+Private-Package: org.apache.tuscany.sca.aspectj;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany AOP-based Logging and Tracing
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
 Bundle-Version: 1.4
+Bnd-LastModified: 1225397489546
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: The Apache Software Foundation provides support fo
  r the Apache community of open-source software projects.    The Apach
  e projects are characterized by a collaborative, consensus based deve
@@ -12,11 +15,8 @@ Bundle-Description: The Apache Software Foundation provides support fo
  ire to create high quality software that leads the way in its field. 
     We consider ourselves not simply a group of projects sharing a ser
  ver, but rather a community of developers    and users.
-Bundle-Name: Apache Tuscany AOP-based Logging and Tracing
-Private-Package: org.apache.tuscany.sca.aspectj;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+Import-Package: org.aspectj.lang,org.aspectj.lang.annotation,org.aspec
+ tj.lang.reflect,org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.tracing.aspect
-Tool: Bnd-0.0.255
+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 38f0bd7f77..e3e2db3715 100644
--- a/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
@@ -1,23 +1,26 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.workspace.builder.impl;version
+ ="1.4",org.apache.tuscany.sca.workspace.processor.impl;version="1.4",
+ org.apache.tuscany.sca.workspace.scanner.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Domain Workspace Implementation
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+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"
-Bnd-LastModified: 1225317078168
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Domain Workspace Implementation
-Bundle-Name: Apache Tuscany SCA Domain Workspace Implementation
-Private-Package: org.apache.tuscany.sca.workspace.builder.impl;version
- ="1.4",org.apache.tuscany.sca.workspace.processor.impl;version="1.4",
- org.apache.tuscany.sca.workspace.scanner.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ 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
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.impl
-Tool: Bnd-0.0.255
+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 f9a3a6db16..5ae125e862 100644
--- a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Private-Package: org.apache.tuscany.sca.workspace.xml;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Domain Workspace XML Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397197140
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Domain Workspace XML Model
 Import-Package: javax.xml.namespace,javax.xml.stream,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.monitor;version="1.4",org.apache.tuscany.sca.workspace;vers
- ion="1.4"
-Bnd-LastModified: 1225317074543
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA Domain Workspace XML Model
-Bundle-Name: Apache Tuscany SCA Domain Workspace XML Model
-Private-Package: org.apache.tuscany.sca.workspace.xml;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ ion="1.4",org.junit;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
index 86bb8bd8d0..305df48550 100644
--- a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.workspace;uses:="org.apache.tus
+ cany.sca.contribution";version="1.4",org.apache.tuscany.sca.workspace
+ .builder;uses:="org.apache.tuscany.sca.workspace,org.apache.tuscany.s
+ ca.core,org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.mo
+ nitor,org.apache.tuscany.sca.extensibility";version="1.4"
+Private-Package: org.apache.tuscany.sca.workspace.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Domain Workspace Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397195718
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Domain Workspace Model
 Import-Package: org.apache.tuscany.sca.contribution;version="1.4",org.
  apache.tuscany.sca.contribution.resolver;version="1.4",org.apache.tus
  cany.sca.core;version="1.4",org.apache.tuscany.sca.extensibility;vers
  ion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.tus
  cany.sca.workspace;version="1.4",org.apache.tuscany.sca.workspace.bui
  lder;version="1.4"
-Bnd-LastModified: 1225317073465
-Export-Package: org.apache.tuscany.sca.workspace;uses:="org.apache.tus
- cany.sca.contribution";version="1.4",org.apache.tuscany.sca.workspace
- .builder;uses:="org.apache.tuscany.sca.workspace,org.apache.tuscany.s
- ca.extensibility,org.apache.tuscany.sca.monitor,org.apache.tuscany.sc
- a.core,org.apache.tuscany.sca.contribution";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA Domain Workspace Model
-Bundle-Description: Apache Tuscany SCA Domain Workspace Model
-Private-Package: org.apache.tuscany.sca.workspace.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace
-Tool: Bnd-0.0.255
+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 26f07b2699..6bdf997286 100644
--- a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
@@ -1,6 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.xsd.xml;uses:="org.apache.ws.co
+ mmons.schema,org.apache.ws.commons.schema.resolver,org.apache.tuscany
+ .sca.contribution,org.apache.tuscany.sca.core,org.apache.tuscany.sca.
+ monitor,org.w3c.dom,org.apache.tuscany.sca.contribution.namespace,jav
+ ax.xml.namespace,org.xml.sax,javax.xml.stream,org.apache.tuscany.sca.
+ contribution.resolver,org.apache.tuscany.sca.contribution.processor,o
+ rg.apache.tuscany.sca.xsd";version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA XSD XML Processor
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397288437
+Bundle-ManifestVersion: 2
 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,org.apache.tuscan
  y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.
  namespace;version="1.4",org.apache.tuscany.sca.contribution.processor
@@ -8,21 +22,8 @@ Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
  1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca
  .monitor;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.a
  pache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema,
- org.apache.ws.commons.schema.resolver,org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1225317148619
-Export-Package: org.apache.tuscany.sca.xsd.xml;uses:="org.xml.sax,org.
- apache.ws.commons.schema,javax.xml.namespace,org.apache.tuscany.sca.m
- onitor,org.w3c.dom,org.apache.tuscany.sca.xsd,org.apache.tuscany.sca.
- contribution.resolver,org.apache.tuscany.sca.contribution,org.apache.
- tuscany.sca.contribution.processor,org.apache.ws.commons.schema.resol
- ver,org.apache.tuscany.sca.core,org.apache.tuscany.sca.contribution.n
- amespace,javax.xml.stream";version="1.4"
-Bundle-Version: 1.4
-Bundle-Description: Apache Tuscany SCA XSD XML Processor
-Bundle-Name: Apache Tuscany SCA XSD XML Processor
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
+ org.apache.ws.commons.schema.resolver,org.w3c.dom,org.xml.sax,org.jun
+ it;resolution:=optional,junit.framework;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.xsd.xml
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
 
diff --git a/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
index a0ee5f6c43..0d5adca756 100644
--- a/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_11 (Sun Microsystems Inc.)
+Export-Package: org.apache.tuscany.sca.xsd;uses:="org.apache.ws.common
+ s.schema,org.apache.tuscany.sca.assembly,org.w3c.dom,javax.xml.namesp
+ ace";version="1.4"
+Private-Package: org.apache.tuscany.sca.xsd.impl;version="1.4"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA XSD Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397174343
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA XSD Model
 Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
  rsion="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apache.ws.co
  mmons.schema,org.w3c.dom
-Bnd-LastModified: 1225317059652
-Export-Package: org.apache.tuscany.sca.xsd;uses:="org.apache.ws.common
- s.schema,javax.xml.namespace,org.w3c.dom,org.apache.tuscany.sca.assem
- bly";version="1.4"
-Bundle-Version: 1.4
-Bundle-Name: Apache Tuscany SCA XSD Model
-Bundle-Description: Apache Tuscany SCA XSD Model
-Private-Package: org.apache.tuscany.sca.xsd.impl;version="1.4"
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
 Bundle-SymbolicName: org.apache.tuscany.sca.xsd
-Tool: Bnd-0.0.255
+Bundle-DocURL: http://www.apache.org/
author	rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>	2008-10-30 20:27:32 +0000
committer	rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>	2008-10-30 20:27:32 +0000
commit	81014f70174926903e10cbcba3ad657494f9bce0 (patch)
tree	f2921c56f74c984010c69e7601cccb934dc454c8 /branches
parent	bfe094c6cd1cff5182683b9b0d1e6f6033e57da3 (diff)