110 files changed, 1372 insertions, 1371 deletions
diff --git a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
index ba09044111..25cd7c4695 100644
--- a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
@@ -8,32 +8,32 @@ Export-Package: org.apache.tuscany.sca.assembly.xml;uses:="org.apache.
  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"
+ ssor,org.apache.tuscany.sca.interfacedef.impl";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
- .xml;version="1.4",org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.java;version="1.4",org.apache.tus
- cany.sca.contribution.namespace;version="1.4",org.apache.tuscany.sca.
- contribution.processor;version="1.4",org.apache.tuscany.sca.contribut
- ion.resolver;version="1.4",org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",org.apache.tuscany.s
- ca.interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.imp
- l;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apac
- he.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.policy.uti
- l;version="1.4",org.w3c.dom,org.xml.sa
+ he.tuscany.sca.assembly;version="2.0.0",org.apache.tuscany.sca.assembly
+ .xml;version="2.0.0",org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",org.apache.tus
+ cany.sca.contribution.namespace;version="2.0.0",org.apache.tuscany.sca.
+ contribution.processor;version="2.0.0",org.apache.tuscany.sca.contribut
+ ion.resolver;version="2.0.0",org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",org.apache.tuscany.s
+ ca.interfacedef;version="2.0.0",org.apache.tuscany.sca.interfacedef.imp
+ l;version="2.0.0",org.apache.tuscany.sca.monitor;version="2.0.0",org.apac
+ he.tuscany.sca.policy;version="2.0.0",org.apache.tuscany.sca.policy.uti
+ l;version="2.0.0",org.w3c.dom,org.xml.sa
  x;resolution:=optional,javax.xml
  .validation;resolution:=optional,org.apache.tuscany.sca.assembly.buil
- der;version="1.4";resolution:=optional
+ der;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
index 3fde8bc9bb..7d6d0951f4 100644
--- a/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xsd/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas
 Bnd-LastModified: 1225397088359
diff --git a/java/sca/modules/assembly/META-INF/MANIFEST.MF b/java/sca/modules/assembly/META-INF/MANIFEST.MF
index 11a82b4e4f..06b5451177 100644
--- a/java/sca/modules/assembly/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
 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"
+ rg.apache.tuscany.sca.interfacedef,javax.xml.namespace";version="2.0.0"
  ,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
+ any.sca.interfacedef,javax.xml.namespace";version="2.0.0",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"
+ tuscany.sca.extensibility";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=
- "1.4"
+ "2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397097203
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -26,17 +26,17 @@ Import-Package: javax.xml.namespace,
  javax.xml.transform.dom,
  javax.xml.transform.sax,
  javax.xml.xpath,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
  org.w3c.dom,
  org.xml.sax
 Bundle-SymbolicName: org.apache.tuscany.sca.assembly
diff --git a/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF
index 8e52c6f2a8..a82a675347 100644
--- a/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.atom.collection;uses:="
- org.osoa.sca.annotations,org.apache.abdera.model";version="1.4"
+ org.osoa.sca.annotations,org.apache.abdera.model";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397264250
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -31,25 +31,25 @@ Import-Package: javax.activation;version="1.1";resolution:=optional,
  org.apache.commons.httpclient.auth,
  org.apache.commons.httpclient.methods,
  org.apache.commons.httpclient.params,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.atom;version="1.4",
- org.apache.tuscany.sca.binding.atom.collection;version="1.4",
- org.apache.tuscany.sca.binding.http;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.atom;version="2.0.0",
+ org.apache.tuscany.sca.binding.atom.collection;version="2.0.0",
+ org.apache.tuscany.sca.binding.http;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-atom/META-INF/MANIFEST.MF b/java/sca/modules/binding-atom/META-INF/MANIFEST.MF
index 4b58729aa2..ff7fe96475 100644
--- a/java/sca/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-atom/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.atom;uses:="org.apache.
- tuscany.sca.assembly";version="1.4"
+ tuscany.sca.assembly";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.binding.atom.impl;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
+Bundle-Version: 2.0.0
 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: javax.xml.stream;resolution:=optional,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.atom;version="1.4",
- org.apache.tuscany.sca.core;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.monitor;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.policy;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.atom;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF
index 88a38c8dc1..7a690d8360 100644
--- a/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ 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
+ ovider.types";version="2.0.0",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
@@ -11,23 +11,23 @@ Export-Package: org.apache.tuscany.sca.binding.corba.provider.service;
  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
+ sca.host.corba,org.osoa.sca";version="2.0.0",org.apache.tuscany.sca.bin
+ ding.corba.provider.exceptions;version="2.0.0",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.
+ ba.provider.exceptions";version="2.0.0",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
+ version="2.0.0",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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397143078
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -35,30 +35,30 @@ Bundle-Description: Apache Tuscany SCA CORBA Binding Runtime
 Import-Package: javax.xml.namespace;resolution:=optional,
  
  net.sf.cglib.proxy,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.corba;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.exceptions;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.exceptions;version="2.0.0",
  org.apache.tuscany.sca.binding.corba.provider.meta;resolution:=optional,
- org.apache.tuscany.sca.binding.corba.provider.reference;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.service;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.types;version="1.4",
+ org.apache.tuscany.sca.binding.corba.provider.reference;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.service;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.types;version="2.0.0",
  org.apache.tuscany.sca.binding.corba.provider.types.util;resolution:=optional,
  org.apache.tuscany.sca.binding.corba.provider.util;resolution:=optional,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.corba;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.corba;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  
  org.omg.CORBA,
  org.omg.CORBA.portable,
  org.omg.CosNaming;resolution:=optional,
- org.osoa.sca;version="1.4"
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-corba/META-INF/MANIFEST.MF b/java/sca/modules/binding-corba/META-INF/MANIFEST.MF
index 2a00b9501b..d41630838c 100644
--- a/java/sca/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-corba/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.corba;uses:="org.apache
- .tuscany.sca.assembly,javax.xml.namespace";version="1.4"
+ .tuscany.sca.assembly,javax.xml.namespace";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.binding.corba;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.host.corba;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4.0",
- org.apache.tuscany.sca.policy;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.corba;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 464fe479a3..b75c6dd265 100644
--- a/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 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"
+ ",org.apache.tuscany.sca.binding.ejb.provider;version="2.0.0",org.apach
+ e.tuscany.sca.binding.ejb.util;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397250828
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -19,15 +19,15 @@ Import-Package: javax.ejb,
  
  net.sf.cglib.core,
  net.sf.cglib.proxy,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.ejb;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.ejb;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.omg.CORBA,
  org.omg.CORBA.portable,
  org.omg.CORBA_2_3.portable,
@@ -35,8 +35,8 @@ Import-Package: javax.ejb,
  org.omg.IOP,
  org.omg.PortableInterceptor,
  org.omg.stub.java.rmi,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF b/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
index 33493eee71..5aa1b50c93 100644
--- a/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 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"
+ uscany.sca.assembly,javax.xml.namespace";version="2.0.0"
+Private-Package: org.apache.tuscany.sca.binding.ejb.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.binding.ejb;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.interfacedef;version="1.4.0",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.ejb;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
index 91b9519b28..8a5bfe6773 100644
--- a/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 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"
+ ta";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397270375
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -26,23 +26,23 @@ Import-Package: com.google.gdata.client,
  org.apache.commons.httpclient.auth,
  org.apache.commons.httpclient.methods,
  org.apache.commons.httpclient.params,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.gdata;version="1.4",
- org.apache.tuscany.sca.binding.gdata.collection;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.gdata;version="2.0.0",
+ org.apache.tuscany.sca.binding.gdata.collection;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-gdata/META-INF/MANIFEST.MF b/java/sca/modules/binding-gdata/META-INF/MANIFEST.MF
index 7a9b95a055..6d5d52037e 100644
--- a/java/sca/modules/binding-gdata/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-gdata/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.gdata;uses:="org.apache
- .tuscany.sca.assembly";version="1.4"
+ .tuscany.sca.assembly";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.binding.gdata.impl;version="1.
- 4",org.apache.tuscany.sca.binding.gdata.xml;version="1.4"
+ 4",org.apache.tuscany.sca.binding.gdata.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
+ y.sca.assembly;version="2.0.0",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
+ ",org.apache.tuscany.sca.contribution.resolver;version="2.0.0",org.apac
+ he.tuscany.sca.core;version="2.0.0",org.apache.tuscany.sca.policy;versi
  on="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 69962bd117..f132e9191e 100644
--- a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF
@@ -5,24 +5,24 @@ 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
+Bundle-Version: 2.0.0
 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.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.http;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.policy.authentication.basic;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.http;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.http.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-http/META-INF/MANIFEST.MF b/java/sca/modules/binding-http/META-INF/MANIFEST.MF
index a283a6c26e..a68b0c1e8d 100644
--- a/java/sca/modules/binding-http/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-http/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.http;uses:="org.apache.
- tuscany.sca.assembly,javax.servlet.http";version="1.4"
+ tuscany.sca.assembly,javax.servlet.http";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.binding.http;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.http;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.http
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index 73da347ab4..7e1dea585c 100644
--- a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Export-Package: org.apache.tuscany.sca.binding.jms.provider;uses:="org
  ,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"
+ ws,org.apache.tuscany.sca.work";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397307750
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -23,25 +23,25 @@ Import-Package: javax.jms,
  javax.xml.stream,
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.jms;version="1.4",
- org.apache.tuscany.sca.binding.jms.provider;version="1.4",
- org.apache.tuscany.sca.binding.jms.xml;version="1.4.0",
- org.apache.tuscany.sca.binding.ws;version="1.4",
- org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.work;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms.provider;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-jms/META-INF/MANIFEST.MF b/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
index 0e2a393734..0eb40a9005 100644
--- a/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jms/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.jms;version="1.4";uses:="org.apache.tuscany.sca.assembly",
- org.apache.tuscany.sca.binding.jms.xml;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"
+Export-Package: org.apache.tuscany.sca.binding.jms;version="2.0.0";uses:="org.apache.tuscany.sca.assembly",
+ org.apache.tuscany.sca.binding.jms.xml;version="2.0.0"
+Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="2.0.0"
+ ,org.apache.tuscany.sca.binding.jms.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397280359
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -15,16 +15,16 @@ Bundle-Description: Apache Tuscany SCA JMS Binding Model
 Import-Package: javax.xml.namespace,
  javax.xml.stream,
  
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.binding.jms;version="1.4",
- org.apache.tuscany.sca.binding.jms.xml;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4.0",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 66b107609d..06783da91f 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Export-Package: org.apache.tuscany.sca.binding.jsonrpc.provider;uses:=
  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"
+ host.http,org.osoa.sca,javax.servlet.http";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397318078
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -19,23 +19,23 @@ Import-Package: com.metaparadigm.jsonrpc,
  javax.servlet,
  javax.servlet.http,
  
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.jsonrpc;version="1.4",
- org.apache.tuscany.sca.binding.jsonrpc.provider;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.json;version="1.4.0",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.jsonrpc;version="2.0.0",
+ org.apache.tuscany.sca.binding.jsonrpc.provider;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.json;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.json,
  
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index 8ffba5b43e..f1d73db1fb 100644
--- a/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-jsonrpc/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.jsonrpc;uses:="org.apac
- he.tuscany.sca.assembly,org.apache.tuscany.sca.policy";version="1.4"
+ he.tuscany.sca.assembly,org.apache.tuscany.sca.policy";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.binding.jsonrpc.impl;version="
  1.4"
 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
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",org.apac
+ he.tuscany.sca.assembly.xml;version="2.0.0",org.apache.tuscany.sca.bind
+ ing.jsonrpc;version="2.0.0",org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 7c0706f387..be0b859d11 100644
--- a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397324375
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -13,19 +13,19 @@ Bundle-Description: Apache Tuscany SCA RMI Binding Extension
 Import-Package: net.sf.cglib.asm,
  net.sf.cglib.core,
  net.sf.cglib.proxy,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.rmi;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.rmi;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.rmi;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.rmi;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi.runtime
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
index 81c66abbfc..952e1ed163 100644
--- a/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rmi/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.rmi;uses:="org.apache.t
- uscany.sca.assembly";version="1.4"
-Private-Package: org.apache.tuscany.sca.binding.rmi.impl;version="1.4"
+ uscany.sca.assembly";version="2.0.0"
+Private-Package: org.apache.tuscany.sca.binding.rmi.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.apache.tuscany.sca.binding.rmi;version="1.4"
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.rmi;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF b/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF
index b76536e0f5..1818de2fd5 100644
--- a/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.binding.rss.collection;version
- ="1.4",org.apache.tuscany.sca.binding.rss.provider;version="1.4"
+ ="1.4",org.apache.tuscany.sca.binding.rss.provider;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397329562
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -17,23 +17,23 @@ Import-Package: com.sun.syndication.feed.atom,
  javax.servlet.http,
  javax.xml.namespace,
  org.apache.commons.codec.binary,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.rss;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.rss;version="2.0.0",
  org.apache.tuscany.sca.binding.rss.collection;resolution:=optional,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.jdom;version="1.0.0",
- org.osoa.sca.annotations;version="1.4"
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss.rome
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-rss/META-INF/MANIFEST.MF b/java/sca/modules/binding-rss/META-INF/MANIFEST.MF
index c2b76fa34c..51294d796d 100644
--- a/java/sca/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rss/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.binding.rss;uses:="org.apache.t
- uscany.sca.assembly";version="1.4"
-Private-Package: org.apache.tuscany.sca.binding.rss.impl;version="1.4"
+ uscany.sca.assembly";version="2.0.0"
+Private-Package: org.apache.tuscany.sca.binding.rss.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",org.apac
+ he.tuscany.sca.binding.rss;version="2.0.0",org.apache.tuscany.sca.polic
+ y;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF
index c4c462c6dd..680a88f61a 100644
--- a/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF
@@ -5,31 +5,31 @@ 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
+Bundle-Version: 2.0.0
 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;version="1.4",
- org.apache.tuscany.sca.binding.sca;version="1.4",
- org.apache.tuscany.sca.binding.ws;version="1.4",
- org.apache.tuscany.sca.binding.ws.axis2;version="1.4",
- org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.endpointresolver;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.sca;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.endpointresolver;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF
index f3d650a7fb..c9df9049dd 100644
--- a/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397364015
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -15,25 +15,25 @@ Import-Package: javax.xml.namespace;version="1.0",
  javax.xml.stream,
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.exceptions;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.reference;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.service;version="1.4",
- org.apache.tuscany.sca.binding.corba.provider.types;version="1.4",
- org.apache.tuscany.sca.binding.sca;version="1.4",
- org.apache.tuscany.sca.binding.ws;version="1.4",
- org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.corba;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.exceptions;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.reference;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.service;version="2.0.0",
+ org.apache.tuscany.sca.binding.corba.provider.types;version="2.0.0",
+ org.apache.tuscany.sca.binding.sca;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.corba;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.omg.CORBA,
- org.osoa.sca;version="1.4"
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.corba
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-sca-xml/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-xml/META-INF/MANIFEST.MF
index 20a51c6a7a..a814b20348 100644
--- a/java/sca/modules/binding-sca-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca-xml/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.binding.sca.xml;version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.sca.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4.0",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
index a6846d9a56..eef8cb3f83 100644
--- a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="1.4"
- ,org.apache.tuscany.sca.binding.sca.provider;version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="2.0.0"
+ ,org.apache.tuscany.sca.binding.sca.provider;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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: javax.xml.stream;resolution:=optional,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
index 9dd79bdef8..2c4f58316c 100644
--- a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="1.4.0",
- org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="1.4";
+Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="2.0.0";
   uses:="org.apache.axis2,
    org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
@@ -18,12 +18,12 @@ Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.to
    org.apache.tuscany.sca.policy.util,
    org.apache.tuscany.sca.contribution.processor,
    org.osoa.sca",
- org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="1.4.0"
+ org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397340328
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -36,23 +36,23 @@ Import-Package: javax.xml.namespace,
  org.apache.axis2.context,
  org.apache.axis2.description,
  org.apache.axis2.engine,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="1.4.0",
- org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="1.4",
- org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="1.4.0",
- 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.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.authentication.token;version="1.4.0",
- org.apache.tuscany.sca.policy.security;version="1.4.0",
- org.apache.tuscany.sca.policy.util;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.authentication.token;version="2.0.0",
+ org.apache.tuscany.sca.policy.security;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.ws
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 530098c847..e560e71668 100644
--- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -27,15 +27,15 @@ Export-Package: org.apache.tuscany.sca.binding.ws.axis2;uses:="org.apa
  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"
+ ;version="2.0.0",org.apache.tuscany.sca.binding.ws.axis2.engine.config.
+ modules;version="2.0.0",org.apache.tuscany.sca.binding.ws.axis2.engine.
+ config.services;version="2.0.0",org.apache.tuscany.sca.binding.ws.axis2
+ .policy.authentication.basic;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397353000
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -80,37 +80,37 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  org.apache.commons.httpclient.params,
  org.apache.commons.logging,
  org.apache.neethi,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.ws;version="1.4",
- org.apache.tuscany.sca.binding.ws.axis2;version="1.4",
- org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="1.4.0",
- org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="1.4.0",
- org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="1.4.0",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.authentication.basic;version="1.4",
- org.apache.tuscany.sca.policy.security;version="1.4.0",
- org.apache.tuscany.sca.policy.util;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
- org.apache.tuscany.sca.xsd.xml;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",
+ org.apache.tuscany.sca.policy.security;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0",
  org.apache.ws.commons.schema,
  org.apache.ws.commons.schema.resolver,
  org.apache.ws.security,
  org.apache.ws.security.handler,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.w3c.dom,
  org.xml.sax
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2
diff --git a/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
index 18dc877524..2f31553634 100644
--- a/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@ Export-Package: org.apache.tuscany.sca.binding.ws.wsdlgen;uses:="org.a
  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"
+ mons.schema.utils,org.apache.tuscany.sca.xsd";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397303515
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -33,27 +33,27 @@ Import-Package: javax.jws;resolution:=optional,
  javax.xml.namespace,
  javax.xml.parsers,
  javax.xml.ws;resolution:=optional,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.binding.ws;version="1.4",
- org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.jaxb;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
- org.apache.tuscany.sca.xsd.xml;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0";resolution:=optional,
  org.apache.ws.commons.schema,
  org.apache.ws.commons.schema.utils,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.wsdlgen
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-ws-xml/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-xml/META-INF/MANIFEST.MF
index 7a8ee0e12e..2ae04552b1 100644
--- a/java/sca/modules/binding-ws-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-xml/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.binding.ws.xml;version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.ws.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397333296
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -15,20 +15,20 @@ Import-Package: javax.wsdl,
  javax.xml.stream,
  javax.xml.transform,
  javax.xml.transform.dom,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.binding.ws;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
  org.apache.tuscany.sca.binding.ws.wsdlgen,
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.xml
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-ws/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
index f7d2ff7b31..a4ce5eb337 100644
--- a/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 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
+ g.w3c.dom,javax.wsdl,javax.xml.namespace";version="2.0.0",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"
+Private-Package: org.apache.tuscany.sca.binding.ws.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
+ assembly;version="2.0.0",org.apache.tuscany.sca.assembly.builder;versio
+ n="1.4",org.apache.tuscany.sca.binding.ws;version="2.0.0",org.apache.tu
+ scany.sca.binding.ws.addressing;version="2.0.0",org.apache.tuscany.sca.
+ interfacedef;version="2.0.0",org.apache.tuscany.sca.interfacedef.wsdl;v
+ ersion="1.4",org.apache.tuscany.sca.policy;version="2.0.0",org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/common-xml/META-INF/MANIFEST.MF b/java/sca/modules/common-xml/META-INF/MANIFEST.MF
index 31727de30c..ad4d6bd487 100644
--- a/java/sca/modules/common-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/common-xml/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Common XML
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397108125
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -22,8 +22,8 @@ Import-Package: javax.xml.namespace,
  org.xml.sax,
  org.xml.sax.ext,
  org.xml.sax.helpers,
- org.apache.tuscany.sca.core;version="1.4.0",
- org.apache.tuscany.sca.extensibility;version="1.4.0"
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.common.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/contribution-java/META-INF/MANIFEST.MF b/java/sca/modules/contribution-java/META-INF/MANIFEST.MF
index 7d338e5322..89e805d0d1 100644
--- a/java/sca/modules/contribution-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-java/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.contribution.java;uses:="org.ap
- ache.tuscany.sca.contribution";version="1.4"
+ ache.tuscany.sca.contribution";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.contribution.java.impl;version
- ="1.4"
+ ="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.java;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.extensibility;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.java
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/contribution-namespace/META-INF/MANIFEST.MF b/java/sca/modules/contribution-namespace/META-INF/MANIFEST.MF
index d369b9de49..ac9c86fb77 100644
--- a/java/sca/modules/contribution-namespace/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-namespace/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.contribution.namespace;uses:="o
- rg.apache.tuscany.sca.contribution";version="1.4"
+ rg.apache.tuscany.sca.contribution";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.contribution.namespace.impl;ve
- rsion="1.4"
+ rsion="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.namespace;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4"
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.namespace
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/contribution-resource/META-INF/MANIFEST.MF b/java/sca/modules/contribution-resource/META-INF/MANIFEST.MF
index 71371fa9fd..364c48b8bc 100644
--- a/java/sca/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-resource/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.contribution.resource;uses:="or
- g.apache.tuscany.sca.contribution";version="1.4"
+ g.apache.tuscany.sca.contribution";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.contribution.resource;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resource;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.resource
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF b/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
index 275fadadc7..d80ced9e24 100644
--- a/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.contribution.processor.xml;ver
- sion="1.4"
+ sion="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397199187
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -14,13 +14,13 @@ Import-Package: javax.xml.namespace,
  javax.xml.parsers,
  javax.xml.stream,
  javax.xml.stream.events,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.xml
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/contribution/META-INF/MANIFEST.MF b/java/sca/modules/contribution/META-INF/MANIFEST.MF
index d0a5651923..171a437842 100644
--- a/java/sca/modules/contribution/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 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
+ ensibility";version="2.0.0",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
+ ity";version="2.0.0",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
+ org.xml.sax.helpers";version="2.0.0",org.apache.tuscany.sca.contributio
  n;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contr
- ibution.resolver";version="1.4"
+ ibution.resolver";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397102546
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -30,15 +30,15 @@ Import-Package: javax.xml.namespace,
  javax.xml.transform,
  javax.xml.transform.stream,
  javax.xml.validation,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.contribution.scanner;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.contribution.scanner;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.xml.sax,
  org.xml.sax.helpers
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution
diff --git a/java/sca/modules/core-databinding/META-INF/MANIFEST.MF b/java/sca/modules/core-databinding/META-INF/MANIFEST.MF
index e8d9bcbce0..5f3b75409b 100644
--- a/java/sca/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core-databinding/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 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"
+ n="2.0.0",org.apache.tuscany.sca.core.databinding.processor;version="2.0.0",
+ org.apache.tuscany.sca.core.databinding.transformers;version="2.0.0"
+ ,org.apache.tuscany.sca.core.databinding.wire;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397235359
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -17,32 +17,32 @@ Import-Package: javax.xml.bind.annotation.adapters,
  javax.xml.stream,
  javax.xml.transform,
  javax.xml.transform.stream,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.context;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.annotation;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.jaxb;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.context;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.annotation;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0",
  org.w3c.dom;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
 Bundle-DocURL: http://www.apache.org/
 Export-Package: org.apache.tuscany.sca.core.databinding.processor;
- version="1.4";uses:="org.w3c.dom"
+ version="2.0.0";uses:="org.w3c.dom"
 
diff --git a/java/sca/modules/core-spi/META-INF/MANIFEST.MF b/java/sca/modules/core-spi/META-INF/MANIFEST.MF
index 12b9a19364..0e44882504 100644
--- a/java/sca/modules/core-spi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core-spi/META-INF/MANIFEST.MF
@@ -1,45 +1,45 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.invocation;uses:="org.apache.tu
- scany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="1.4",
+ scany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="2.0.0",
  org.apache.tuscany.sca.runtime;uses:="org.apache.tuscany.sca.invocati
  on,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.endpointres
  olver,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany
- .sca.interfacedef";version="1.4",org.apache.tuscany.sca.context;uses:
+ .sca.interfacedef";version="2.0.0",org.apache.tuscany.sca.context;uses:
  ="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.
  apache.tuscany.sca.core,org.osoa.sca,org.apache.tuscany.sca.extensibi
- lity";version="1.4",org.apache.tuscany.sca.provider;uses:="org.apache
+ lity";version="2.0.0",org.apache.tuscany.sca.provider;uses:="org.apache
  .tuscany.sca.invocation,org.apache.tuscany.sca.runtime,org.apache.tus
  cany.sca.assembly,org.apache.tuscany.sca.definitions,org.apache.tusca
  ny.sca.core,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sc
- a.extensibility";version="1.4",org.apache.tuscany.sca.endpointresolve
+ a.extensibility";version="2.0.0",org.apache.tuscany.sca.endpointresolve
  r;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,
- org.apache.tuscany.sca.extensibility";version="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"
+ org.apache.tuscany.sca.extensibility";version="2.0.0",org.apache.tuscan
+ y.sca.work;version="2.0.0",org.apache.tuscany.sca.management;uses:="org
+ .apache.tuscany.sca.runtime";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.apache.tuscany.sca.context;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.endpointresolver;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.management;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.work;version="1.4",
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.endpointresolver;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.management;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0",
  
- org.osoa.sca;version="1.4"
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/core/META-INF/MANIFEST.MF b/java/sca/modules/core/META-INF/MANIFEST.MF
index 9a8f53771c..1fb2ff9eac 100644
--- a/java/sca/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.core.assembly;version="1.4";
+Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0";
   uses:="org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
    org.apache.tuscany.sca.core.context,
    org.apache.tuscany.sca.core.invocation,
    org.apache.tuscany.sca.core.conversation,
    org.apache.tuscany.sca.interfacedef.java",
- org.apache.tuscany.sca.core.context;version="1.4";
+ org.apache.tuscany.sca.core.context;version="2.0.0";
   uses:="org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
    org.apache.tuscany.sca.context,
@@ -18,9 +18,9 @@ Export-Package: org.apache.tuscany.sca.core.assembly;version="1.4";
    org.apache.tuscany.sca.core.assembly,
    org.osoa.sca,
    org.apache.tuscany.sca.core.invocation",
- org.apache.tuscany.sca.core.conversation;version="1.4";uses:="org.apache.tuscany.sca.runtime,org.osoa.sca",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4";
+ org.apache.tuscany.sca.core.conversation;version="2.0.0";uses:="org.apache.tuscany.sca.runtime,org.osoa.sca",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0";
   uses:="org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.assembly,
    org.apache.tuscany.sca.core,
@@ -31,7 +31,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;version="1.4";
    org.apache.tuscany.sca.work,
    org.apache.tuscany.sca.core.factory,
    org.osoa.sca",
- org.apache.tuscany.sca.core.scope;version="1.4";
+ org.apache.tuscany.sca.core.scope;version="2.0.0";
   uses:="org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.provider,
    org.apache.tuscany.sca.core.scope.impl,
@@ -40,7 +40,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397162265
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -50,34 +50,34 @@ Import-Package: javax.naming,
  javax.xml.namespace,
  javax.xml.stream,
  net.sf.cglib.proxy,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.context;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.core.context;version="1.4",
- org.apache.tuscany.sca.core.conversation;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.core.scope;version="1.4",
- org.apache.tuscany.sca.core.wire;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.endpointresolver;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.work;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.context;version="2.0.0",
+ org.apache.tuscany.sca.core.conversation;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.core.scope;version="2.0.0",
+ org.apache.tuscany.sca.core.wire;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.endpointresolver;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.core
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/data-api/META-INF/MANIFEST.MF b/java/sca/modules/data-api/META-INF/MANIFEST.MF
index 3776d4802a..c6f6575118 100644
--- a/java/sca/modules/data-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/data-api/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.osoa
- .sca.annotations";version="1.4"
+ .sca.annotations";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Data API
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.data.collection;version="2.0.0",o
+ rg.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.data.api
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
index 27299b7b8f..b28e52933d 100644
--- a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -4,23 +4,23 @@ Export-Package: org.apache.tuscany.sca.databinding.axiom;uses:="org.ap
  ,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"
+ ,org.apache.tuscany.sca.databinding.javabeans";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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,org
  .apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tuscany.
- sca.databinding;version="1.4",org.apache.tuscany.sca.databinding.axio
- m;version="1.4",org.apache.tuscany.sca.databinding.impl;version="1.4"
- ,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
+ sca.databinding;version="2.0.0",org.apache.tuscany.sca.databinding.axio
+ m;version="2.0.0",org.apache.tuscany.sca.databinding.impl;version="2.0.0"
+ ,org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",org.apach
+ e.tuscany.sca.interfacedef;version="2.0.0",org.apache.tuscany.sca.inter
+ facedef.impl;version="2.0.0",org.apache.tuscany.sca.interfacedef.util;v
  ersion="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding-fastinfoset/META-INF/MANIFEST.MF b/java/sca/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
index bf9b73f728..8fc38ffe23 100644
--- a/java/sca/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397405343
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -17,9 +17,9 @@ Import-Package: com.sun.xml.fastinfoset,
  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.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
  org.w3c.dom,
  org.xml.sax,
  org.xml.sax.helpers
diff --git a/java/sca/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index 30269ccdca..c3e0cff10d 100644
--- a/java/sca/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397336953
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -24,14 +24,14 @@ Import-Package: javax.xml.bind,
  org.apache.axiom.om.impl,
  org.apache.axiom.om.impl.builder,
  org.apache.axiom.om.util,
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.jaxb;version="1.4",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
  org.apache.tuscany.sca.databinding.jaxb.axiom;resolution:=optional,
- org.apache.tuscany.sca.databinding.xml;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
  org.w3c.dom;resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb.axiom
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
index 2a7a2184b4..ad3fbef921 100644
--- a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@ Export-Package: org.apache.tuscany.sca.databinding.jaxb;uses:="org.apa
  .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"
+ ,javax.xml.bind";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397221390
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -31,19 +31,19 @@ Import-Package: javax.activation,
  javax.xml.transform,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
- org.apache.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.jaxb;version="1.4",
- org.apache.tuscany.sca.databinding.util;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.xsd;version="1.4",
- org.osoa.sca;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
+ org.apache.tuscany.sca.databinding.util;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
  org.w3c.dom,
  org.xml.sax
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb
diff --git a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
index c60394a1ae..536409b50c 100644
--- a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.databinding.json;version="1.4"
- ,org.apache.tuscany.sca.databinding.json.axiom;version="1.4"
+Private-Package: org.apache.tuscany.sca.databinding.json;version="2.0.0"
+ ,org.apache.tuscany.sca.databinding.json.axiom;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397312078
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -14,21 +14,21 @@ Import-Package: com.metaparadigm.jsonrpc,
  javax.xml.namespace,
  javax.xml.stream,
  org.apache.axiom.om,
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.json;version="1.4.0",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.json;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
  org.codehaus.jettison.badgerfish,
  org.codehaus.jettison.json,
  org.codehaus.jettison.mapped,
  org.json,
  
- org.osoa.sca.annotations;version="1.4"
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json
 Bundle-DocURL: http://www.apache.org/
-Export-Package: org.apache.tuscany.sca.databinding.json;version="1.4.0"
+Export-Package: org.apache.tuscany.sca.databinding.json;version="2.0.0"
 
diff --git a/java/sca/modules/databinding-saxon/META-INF/MANIFEST.MF b/java/sca/modules/databinding-saxon/META-INF/MANIFEST.MF
index a1d59a50c3..3c9e95f67d 100644
--- a/java/sca/modules/databinding-saxon/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-saxon/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Export-Package: org.apache.tuscany.sca.databinding.saxon;uses:="org.ap
  .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"
+ .om";version="2.0.0",org.apache.tuscany.sca.databinding.saxon.collectio
+ n;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397384281
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -26,12 +26,12 @@ Import-Package: commonj.sdo;version="2.1",
  net.sf.saxon.query,
  net.sf.saxon.trans,
  net.sf.saxon.value,
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.saxon;version="1.4",
- org.apache.tuscany.sca.databinding.saxon.collection;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.saxon;version="2.0.0",
+ org.apache.tuscany.sca.databinding.saxon.collection;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.saxon
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index 01d84174ee..76259a7555 100644
--- a/java/sca/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
-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"
+Private-Package: com.example.ipo.sdo;version="2.0.0",com.example.ipo.sdo
+ .impl;version="2.0.0",com.example.stock.sdo;version="2.0.0",com.example.s
+ tock.sdo.impl;version="2.0.0",org.apache.tuscany.sca.databinding.sdo2om
+ ;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397381546
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -21,12 +21,12 @@ Import-Package: commonj.sdo;version="2.1",
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,
  org.apache.axiom.om.impl.serialize,
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.sdo;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.sdo;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
  org.apache.tuscany.sdo.api,
  org.apache.tuscany.sdo.helper,
  org.apache.tuscany.sdo.impl,
diff --git a/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF b/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF
index decc3332d2..43c1bd2211 100644
--- a/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF
@@ -10,15 +10,15 @@ Export-Package: org.apache.tuscany.sca.databinding.sdo;uses:="org.apac
  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"
+ ssor,org.apache.tuscany.sca.xsd";version="2.0.0"
+Private-Package: com.example.ipo.sdo;version="2.0.0",com.example.ipo.sdo
+ .impl;version="2.0.0",com.example.stock.sdo;version="2.0.0",com.example.s
+ tock.sdo.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397376421
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -31,22 +31,22 @@ Import-Package: commonj.sdo;version="2.1",
  javax.xml.transform,
  javax.xml.transform.dom,
  
- org.apache.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.sdo;version="1.4",
- org.apache.tuscany.sca.databinding.util;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.sdo;version="2.0.0",
+ org.apache.tuscany.sca.databinding.util;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  org.apache.tuscany.sdo.api,
  org.apache.tuscany.sdo.helper,
  org.apache.tuscany.sdo.impl,
@@ -57,7 +57,7 @@ Import-Package: commonj.sdo;version="2.1",
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.util,
  
- org.osoa.sca;version="1.4",
+ org.osoa.sca;version="2.0.0",
  org.w3c.dom,
  org.w3c.dom.bootstrap,
  org.w3c.dom.ls
diff --git a/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
index a873498182..fb5d2b8be5 100644
--- a/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
@@ -5,22 +5,22 @@ 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
  org.apache.xmlbeans,
  org.apache.xmlbeans.impl.values;resolution:=optional,
  org.apache.xmlbeans.xml.stream;resolution:=optional,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.xmlbeans
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding/META-INF/MANIFEST.MF b/java/sca/modules/databinding/META-INF/MANIFEST.MF
index 14592efd70..8dc3e90df5 100644
--- a/java/sca/modules/databinding/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding/META-INF/MANIFEST.MF
@@ -4,34 +4,34 @@ Export-Package: org.apache.tuscany.sca.databinding;uses:="org.apache.t
  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
+ version="2.0.0",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
+ .sca.databinding.javabeans,org.xml.sax.helpers";version="2.0.0",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
+ .impl";version="2.0.0",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.
+ acedef";version="2.0.0",org.apache.tuscany.sca.databinding.annotation;v
+ ersion="2.0.0",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"
+ rsion="2.0.0"
 Private-Package: org.apache.tuscany.sca.databinding.externalizable;ver
- sion="1.4"
+ sion="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397181875
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -45,18 +45,18 @@ Import-Package: javax.xml.datatype,
  javax.xml.transform.dom,
  javax.xml.transform.sax,
  javax.xml.transform.stream,
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.annotation;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4",
- org.apache.tuscany.sca.databinding.util;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.annotation;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.util;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  org.w3c.dom,
  org.xml.sax,
  org.xml.sax.ext,
diff --git a/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF b/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF
index 23b8f26d8b..e51884fee7 100644
--- a/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF
@@ -1,21 +1,24 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.definitions.xml;version="1.4"
+Private-Package: org.apache.tuscany.sca.definitions.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.definitions.util;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.definitions.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/definitions/META-INF/MANIFEST.MF b/java/sca/modules/definitions/META-INF/MANIFEST.MF
index 94962f0fd7..a18128b83b 100644
--- a/java/sca/modules/definitions/META-INF/MANIFEST.MF
+++ b/java/sca/modules/definitions/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.definitions.util;uses:="org.apa
- che.tuscany.sca.definitions";version="1.4",org.apache.tuscany.sca.def
+ che.tuscany.sca.definitions";version="2.0.0",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"
+ rsion="2.0.0"
+Private-Package: org.apache.tuscany.sca.definitions.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+ ;version="2.0.0",org.apache.tuscany.sca.definitions.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.definitions
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/domain-manager/META-INF/MANIFEST.MF b/java/sca/modules/domain-manager/META-INF/MANIFEST.MF
index 36ada642c2..42e7c62489 100644
--- a/java/sca/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/java/sca/modules/domain-manager/META-INF/MANIFEST.MF
@@ -14,15 +14,15 @@ Export-Package: org.apache.tuscany.sca.domain.manager.impl;uses:="org.
  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:=
+ ";version="2.0.0",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"
+ de,org.osoa.sca";version="2.0.0"
+Private-Package: icons;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397422109
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -36,33 +36,33 @@ Import-Package: javax.servlet,
  org.apache.commons.fileupload,
  org.apache.commons.fileupload.disk,
  org.apache.commons.fileupload.servlet,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4.0",
- org.apache.tuscany.sca.binding.atom;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.core.context;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.domain.manager.impl;version="1.4",
- org.apache.tuscany.sca.domain.manager.launcher;version="1.4",
- org.apache.tuscany.sca.implementation.node;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.node;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.workspace;version="1.4",
- org.apache.tuscany.sca.workspace.builder;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.atom;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.context;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.domain.manager.impl;version="2.0.0",
+ org.apache.tuscany.sca.domain.manager.launcher;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.workspace;version="2.0.0",
+ org.apache.tuscany.sca.workspace.builder;version="2.0.0",
  org.apache.xml.serialize,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/endpoint/META-INF/MANIFEST.MF b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
index 45048e6a2c..07bc37a3f4 100644
--- a/java/sca/modules/endpoint/META-INF/MANIFEST.MF
+++ b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.binding.sca;version="1.4",org.
- apache.tuscany.sca.endpoint.impl;version="1.4"
+Private-Package: org.apache.tuscany.sca.binding.sca;version="2.0.0",org.
+ apache.tuscany.sca.endpoint.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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: javax.xml.stream;resolution:=optional,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution.processor;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution.resolver;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.endpointresolver;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.monitor;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.endpointresolver;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.endpoint
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/extensibility-equinox/META-INF/MANIFEST.MF b/java/sca/modules/extensibility-equinox/META-INF/MANIFEST.MF
index d054b26acb..9d701161cc 100644
--- a/java/sca/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/java/sca/modules/extensibility-equinox/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.extensibility.equinox;version=
- "1.4"
+ "2.0.0"
 Bundle-ActivationPolicy: lazy
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Extensibility for Eclipse Equinox
@@ -8,7 +8,7 @@ Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
 DynamicImport-Package: *
 Eclipse-LazyStart: true
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397425625
 Bundle-Activator: org.apache.tuscany.sca.extensibility.equinox.Equinox
  ServiceDiscoveryActivator
@@ -16,7 +16,7 @@ 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",
+Import-Package: org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.eclipse.core.runtime.adaptor;resolution:=optional,
  org.osgi.framework;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility.equinox
diff --git a/java/sca/modules/extensibility/META-INF/MANIFEST.MF b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
index a66ced1f76..8beea88eca 100644
--- a/java/sca/modules/extensibility/META-INF/MANIFEST.MF
+++ b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.core;uses:="org.apache.tuscany.
- sca.extensibility";version="1.4",org.apache.tuscany.sca.extensibility
- ;version="1.4"
+ sca.extensibility";version="2.0.0",org.apache.tuscany.sca.extensibility
+ ;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Extensibility
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.extensibility;version="1.4"
+Import-Package: org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/host-corba-jee/META-INF/MANIFEST.MF b/java/sca/modules/host-corba-jee/META-INF/MANIFEST.MF
index fa8ae15c83..71fbb7e6a9 100644
--- a/java/sca/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-corba-jee/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.host.corba.jee;version="1.4"
+Private-Package: org.apache.tuscany.sca.host.corba.jee;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397427890
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -12,8 +12,8 @@ Bundle-Description: Apache Tuscany SCA JEE environment CORBA Host
 Import-Package: javax.naming,
  javax.naming.spi;resolution:=optional,
  javax.rmi,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.corba;version="1.4",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.corba;version="2.0.0",
  org.omg.CORBA,
  org.omg.CORBA.portable;resolution:=optional,
  org.omg.CosNaming,
diff --git a/java/sca/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/java/sca/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
index c0071d929f..8edf701bf7 100644
--- a/java/sca/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
@@ -5,16 +5,16 @@ 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.host.corba;version="1.4",
- org.apache.tuscany.sca.host.corba.jse;version="1.4",
- org.apache.tuscany.sca.host.corba.naming;version="1.4",
+Import-Package: org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.corba;version="2.0.0",
+ org.apache.tuscany.sca.host.corba.jse;version="2.0.0",
+ org.apache.tuscany.sca.host.corba.naming;version="2.0.0",
  org.omg.CORBA
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse.tns
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/host-corba-jse/META-INF/MANIFEST.MF b/java/sca/modules/host-corba-jse/META-INF/MANIFEST.MF
index 26d0f037e8..060baa69b9 100644
--- a/java/sca/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-corba-jse/META-INF/MANIFEST.MF
@@ -4,19 +4,19 @@ Export-Package: org.apache.tuscany.sca.host.corba.naming;uses:="org.om
  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"
+ orba,org.omg.CORBA,org.apache.tuscany.sca.core";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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="
+Import-Package: org.apache.tuscany.sca.core;version="2.0.0",org.apache.t
+ uscany.sca.host.corba;version="2.0.0",org.apache.tuscany.sca.host.corba
+ .jse;version="2.0.0",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,org.omg.CORBA.portable;resolu
diff --git a/java/sca/modules/host-corba/META-INF/MANIFEST.MF b/java/sca/modules/host-corba/META-INF/MANIFEST.MF
index 8e0abcaa22..2b38d299c0 100644
--- a/java/sca/modules/host-corba/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-corba/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.host.corba;uses:="org.omg.CORBA
- ";version="1.4"
+ ";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA CORBA Host Extension Point
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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
+Import-Package: org.apache.tuscany.sca.host.corba;version="2.0.0",org.om
  g.CORBA
 Bundle-SymbolicName: org.apache.tuscany.sca.host.corba
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/host-http/META-INF/MANIFEST.MF b/java/sca/modules/host-http/META-INF/MANIFEST.MF
index 328bc7b1f5..1c4e6bf2cc 100644
--- a/java/sca/modules/host-http/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-http/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.host.http;uses:="javax.servlet,
- javax.servlet.http";version="1.4"
+ javax.servlet.http";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
 Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc
- a.host.http;version="1.4"
+ a.host.http;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.http
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/host-jetty/META-INF/MANIFEST.MF b/java/sca/modules/host-jetty/META-INF/MANIFEST.MF
index 971164f399..deac071675 100644
--- a/java/sca/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-jetty/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.http.jetty;version="1.4"
+Private-Package: org.apache.tuscany.sca.http.jetty;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397258562
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -13,9 +13,9 @@ Import-Package: javax.net.ssl;resolution:=optional,
  javax.servlet,
  javax.servlet.http;resolution:=optional,
  
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.work;version="1.4",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0",
  org.mortbay.component;version="6.1.7",
  org.mortbay.jetty;version="6.1.7",
  org.mortbay.jetty.handler;version="6.1.7",
diff --git a/java/sca/modules/host-rmi/META-INF/MANIFEST.MF b/java/sca/modules/host-rmi/META-INF/MANIFEST.MF
index e85017a67f..805cc806c4 100644
--- a/java/sca/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-rmi/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.host.rmi;version="1.4"
+Export-Package: org.apache.tuscany.sca.host.rmi;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA RMI Host Extension Point
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.host.rmi;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.rmi
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/host-tomcat/META-INF/MANIFEST.MF b/java/sca/modules/host-tomcat/META-INF/MANIFEST.MF
index 457b27b3b6..d6a87c4ae8 100644
--- a/java/sca/modules/host-tomcat/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-tomcat/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.http.tomcat;version="1.4",org.
- apache.tuscany.sca.http.tomcat.module;version="1.4"
+Private-Package: org.apache.tuscany.sca.http.tomcat;version="2.0.0",org.
+ apache.tuscany.sca.http.tomcat.module;version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Tomcat Servlet Host Extension
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1222833663765
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -16,8 +16,8 @@ Import-Package: javax.naming,javax.naming.directory,javax.servlet,java
  .startup,org.apache.coyote,org.apache.coyote.http11,org.apache.naming
  .resources,org.apache.tomcat.util.buf,org.apache.tomcat.util.http.map
  per,org.apache.tomcat.util.net,org.apache.tuscany.sca.core;version="1
- .4",org.apache.tuscany.sca.host.http;version="1.4",org.apache.tuscany
- .sca.work;version="1.4"
+ .4",org.apache.tuscany.sca.host.http;version="2.0.0",org.apache.tuscany
+ .sca.work;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.tomcat
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/host-webapp-junit/META-INF/MANIFEST.MF b/java/sca/modules/host-webapp-junit/META-INF/MANIFEST.MF
index eec19db794..56b597c164 100644
--- a/java/sca/modules/host-webapp-junit/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-webapp-junit/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 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"
+ r,javax.servlet.http";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
+ pache.tuscany.sca.host.webapp.junit;version="2.0.0",org.junit.runner,or
  g.junit.runner.notification
 Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp.junit
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
index 978516584a..ba1a59121d 100644
--- a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Export-Package: org.apache.tuscany.sca.host.webapp.jsp;uses:="javax.se
  sion="1.4",org.apache.tuscany.sca.host.webapp;uses:="javax.naming,org
  .apache.tuscany.sca.host.embedded.impl,org.apache.tuscany.sca.host.em
  bedded,org.apache.tuscany.sca.core,javax.servlet,org.apache.tuscany.s
- ca.host.http,javax.servlet.http";version="1.4"
+ ca.host.http,javax.servlet.http";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Webapp Host
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1222833658000
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -20,12 +20,12 @@ Import-Package: javax.naming,
  javax.servlet.http,
  javax.servlet.jsp,
  javax.servlet.jsp.tagext,
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4",
- org.apache.tuscany.sca.host.webapp;version="1.4",
- org.apache.tuscany.sca.host.webapp.jsp;version="1.4",
- org.apache.tuscany.sca.node;version="1.4.0",
- org.osoa.sca;version="1.4"
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.host.webapp;version="2.0.0",
+ org.apache.tuscany.sca.host.webapp.jsp;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index e2842f488c..9ed92ac28b 100644
--- a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397447609
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -30,17 +30,17 @@ Import-Package: javax.resource.spi,
  org.apache.ode.il.dbutil,
  org.apache.ode.scheduler.simple,
  org.apache.ode.utils,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.implementation.bpel;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca.annotations;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.implementation.bpel;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-bpel/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel/META-INF/MANIFEST.MF
index f18b080901..ba65f8632d 100644
--- a/java/sca/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 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"
+ ver,javax.xml.namespace";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.bpel.impl;versi
- on="1.4",org.apache.tuscany.sca.implementation.bpel.xml;version="1.4"
+ on="1.4",org.apache.tuscany.sca.implementation.bpel.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397433843
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -18,16 +18,16 @@ Import-Package: javax.wsdl,
  javax.xml.namespace,
  javax.xml.stream,
  
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.implementation.bpel;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.bpel;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-ejb/META-INF/MANIFEST.MF b/java/sca/modules/implementation-ejb/META-INF/MANIFEST.MF
index 3aff9309c7..17dc48478c 100644
--- a/java/sca/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-ejb/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.implementation.ejb;uses:="org.a
- pache.tuscany.sca.assembly";version="1.4"
+ pache.tuscany.sca.assembly";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.ejb.impl;versio
- n="1.4",org.apache.tuscany.sca.implementation.ejb.xml;version="1.4"
+ n="1.4",org.apache.tuscany.sca.implementation.ejb.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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",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
+ y.sca.assembly;version="2.0.0",org.apache.tuscany.sca.contribution.proc
+ essor;version="2.0.0",org.apache.tuscany.sca.contribution.resolver;vers
+ ion="1.4",org.apache.tuscany.sca.core;version="2.0.0",org.apache.tuscan
+ y.sca.implementation.ejb;version="2.0.0",org.apache.tuscany.sca.monitor
+ ;version="2.0.0",org.apache.tuscany.sca.assembly.builder.impl;resolutio
+ n:=optional,org.apache.tuscany.sca.definitions;version="2.0.0";resoluti
+ on:=optional,org.apache.tuscany.sca.policy;version="2.0.0";resolution:=
+ optional,org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution
  :=optional,org.apache.tuscany.sc
- a.assembly.builder;version="1.4";resolution:=optional
+ a.assembly.builder;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.ejb
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index 6a859242ec..cb4ffec5ce 100644
--- a/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ 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
+ version="2.0.0",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
@@ -13,47 +13,47 @@ Export-Package: org.apache.tuscany.sca.implementation.java.context;use
  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"
+ rsion="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.java.invocation
- ;version="1.4",org.apache.tuscany.sca.implementation.java.module;vers
- ion="1.4"
+ ;version="2.0.0",org.apache.tuscany.sca.implementation.java.module;vers
+ ion="2.0.0"
 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
+Bundle-Version: 2.0.0
 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;version="1.4",
- org.apache.tuscany.sca.context;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.context;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.core.scope;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.xml;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4",
- org.apache.tuscany.sca.implementation.java.context;version="1.4",
- org.apache.tuscany.sca.implementation.java.injection;version="1.4",
- org.apache.tuscany.sca.implementation.java.introspect;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.context;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.core.scope;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.context;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",
  org.apache.tuscany.sca.implementation.java.invocation;resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim
  e
diff --git a/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF
index 1fb3b18542..66e9cc8e3c 100644
--- a/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF
@@ -3,26 +3,26 @@ 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4",
- org.apache.tuscany.sca.implementation.java.introspect;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-java/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
index d86b52e726..b7abf65f22 100644
--- a/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
@@ -1,39 +1,38 @@
 Manifest-Version: 1.0
 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
+ ntation.java,org.osoa.sca";version="2.0.0",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"
+ ;version="2.0.0"
 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"
+ on="2.0.0",org.apache.tuscany.sca.implementation.java.introspect.impl;v
+ ersion="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4",
- org.apache.tuscany.sca.implementation.java.introspect;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4.0",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF
index ef9b7f759f..48b294f27b 100644
--- a/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.implementation.node.launcher;us
- es:="org.apache.tuscany.sca.node,org.osoa.sca";version="1.4",org.apac
+ es:="org.apache.tuscany.sca.node,org.osoa.sca";version="2.0.0",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"
+ ax.servlet.http";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.node.provider;v
- ersion="1.4"
+ ersion="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.sca.assembly;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.host.http;version="1.4.0",
- org.apache.tuscany.sca.implementation.node;version="1.4",
- org.apache.tuscany.sca.implementation.node.launcher;version="1.4",
- org.apache.tuscany.sca.implementation.node.webapp;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.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"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.host.http;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node.launcher;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node.webapp;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node.runtim
  e
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-node/META-INF/MANIFEST.MF b/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
index c5b57de800..f89a513dc5 100644
--- a/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
@@ -1,15 +1,14 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.implementation.node;uses:="org.
- apache.tuscany.sca.assembly";version="1.4"
+ apache.tuscany.sca.assembly";version="2.0.0"
 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
- "
+ pl;version="2.0.0",org.apache.tuscany.sca.implementation.node.impl;vers
+ ion="2.0.0",org.apache.tuscany.sca.implementation.node.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397193593
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -18,18 +17,18 @@ Import-Package: javax.xml.namespace,
  javax.xml.parsers,
  javax.xml.stream,
  javax.xml.transform,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.implementation.node;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node;version="2.0.0",
  org.apache.tuscany.sca.implementation.node.impl;resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF b/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF
index 6852a8f363..b8777f45fe 100644
--- a/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF
@@ -7,24 +7,24 @@ 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
+Bundle-Version: 2.0.0
 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.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4.0",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-resource-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
index 24f187b921..586b890ecc 100644
--- a/java/sca/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.implementation.resource.provid
- er;version="1.4"
+ er;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4.0",
- org.apache.tuscany.sca.implementation.resource;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.resource;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource.ru
  ntime
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-resource/META-INF/MANIFEST.MF b/java/sca/modules/implementation-resource/META-INF/MANIFEST.MF
index 55271ff6cc..89e37fe4e3 100644
--- a/java/sca/modules/implementation-resource/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-resource/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.implementation.resource;uses:="
  org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data.collectio
- n";version="1.4"
+ n";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.resource.impl;v
- ersion="1.4"
+ ersion="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.implementation.resource;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.resource;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF
index e08aeb7a56..95371915ab 100644
--- a/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Export-Package: org.apache.tuscany.sca.implementation.script.provider;
  ,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"
+ g.apache.tuscany.sca.interfacedef.wsdl";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.script.engines;
- version="1.4"
+ version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397459984
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -24,21 +24,21 @@ Import-Package: com.sun.script.jruby,
  javax.xml.namespace,
  org.apache.axiom.om,
  org.apache.bsf.xml,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.implementation.script;version="1.4",
- org.apache.tuscany.sca.implementation.script.provider;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4.0",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.implementation.script;version="2.0.0",
+ org.apache.tuscany.sca.implementation.script.provider;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.jruby,
  org.jruby.ast,
  org.jruby.exceptions,
@@ -49,8 +49,8 @@ Import-Package: com.sun.script.jruby,
  org.jruby.runtime.load,
  org.jruby.util,
  org.jruby.util.io,
- org.osoa.sca;version="1.4.0",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script.runt
  ime
diff --git a/java/sca/modules/implementation-script/META-INF/MANIFEST.MF b/java/sca/modules/implementation-script/META-INF/MANIFEST.MF
index 7d3b34d5f3..dd96f10c3a 100644
--- a/java/sca/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-script/META-INF/MANIFEST.MF
@@ -3,26 +3,26 @@ 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"
+ pache.tuscany.sca.monitor,javax.xml.namespace";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.implementation.script;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.script;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
index 956a4f248d..9c1166ca3c 100644
--- a/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
- ion="1.4",org.springframework.sca.xml;version="1.4"
+ ion="1.4",org.springframework.sca.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397466437
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -15,32 +15,32 @@ Bundle-Description: Apache Tuscany SCA Spring Framework Implementation
 Import-Package: javax.xml.namespace,
  javax.xml.stream,
  junit.framework;resolution:=optional,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4",
- org.apache.tuscany.sca.implementation.java.injection;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",
  org.apache.tuscany.sca.implementation.spring,
  org.apache.tuscany.sca.implementation.spring.xml,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.node;resolution:=optional,
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4.0",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.springframework.beans,
  org.springframework.beans.factory,
  org.springframework.beans.factory.config,
diff --git a/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF b/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF
index f35441326e..63678aafe3 100644
--- a/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.implementation.spring;version="1.4";
+Export-Package: org.apache.tuscany.sca.implementation.spring;version="2.0.0";
   uses:="org.apache.tuscany.sca.databinding,
    org.apache.tuscany.sca.runtime,
    org.apache.tuscany.sca.provider,
@@ -32,13 +32,13 @@ Export-Package: org.apache.tuscany.sca.implementation.spring;version="1.4";
    org.apache.tuscany.sca.contribution.processor",
  org.apache.tuscany.sca.implementation.spring.xml
 Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
- ion="1.4",org.springframework.sca.xml;version="1.4"
+ ion="1.4",org.springframework.sca.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397466437
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -46,30 +46,30 @@ Bundle-Description: Apache Tuscany SCA Spring Framework Implementation
   Extension
 Import-Package: javax.xml.namespace,
  javax.xml.stream,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4",
- org.apache.tuscany.sca.implementation.java.injection;version="1.4",
- org.apache.tuscany.sca.implementation.spring;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4.0",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.spring;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.springframework.beans,
  org.springframework.beans.factory,
  org.springframework.beans.factory.config,
diff --git a/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index 3e296842bd..6fc4a501a3 100644
--- a/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.implementation.widget.provider
- ;version="1.4"
+ ;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.implementation.widget;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.widget;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt
  ime
diff --git a/java/sca/modules/implementation-widget/META-INF/MANIFEST.MF b/java/sca/modules/implementation-widget/META-INF/MANIFEST.MF
index 18a2f3ce3b..f112dd57bf 100644
--- a/java/sca/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-widget/META-INF/MANIFEST.MF
@@ -5,30 +5,30 @@ Export-Package: org.apache.tuscany.sca.implementation.widget;uses:="or
  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"
+ .contribution.processor";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.xml;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.data.collection;version="1.4",
- org.apache.tuscany.sca.implementation.widget;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.widget;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF b/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF
index a8d970b4ae..0cd11b6395 100644
--- a/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.apache.tuscany.sca.implementation.xquery;uses:="or
  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"
+ m,net.sf.saxon.event,javax.xml.transform.stream";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.implementation.xquery.impl;ver
  sion="1.4",org.apache.tuscany.sca.implementation.xquery.xml;version="
  1.4"
@@ -18,7 +18,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397469781
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -34,30 +34,30 @@ Import-Package: javax.xml.namespace,
  net.sf.saxon.query,
  net.sf.saxon.trans,
  net.sf.saxon.value,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.impl;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.factory;version="1.4",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.impl;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.saxon;version="1.4",
- org.apache.tuscany.sca.databinding.saxon.collection;version="1.4",
- org.apache.tuscany.sca.implementation.java;version="1.4.0",
- org.apache.tuscany.sca.implementation.java.injection;version="1.4",
- org.apache.tuscany.sca.implementation.xquery;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4.0",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.factory;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.impl;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.saxon;version="2.0.0",
+ org.apache.tuscany.sca.databinding.saxon.collection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java;version="2.0.0",
+ org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",
+ org.apache.tuscany.sca.implementation.xquery;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 041cec9c4c..0c8ba06f2e 100644
--- a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Export-Package: org.apache.tuscany.sca.interfacedef.java.jaxws;uses:="
  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"
+ e.tuscany.sca.interfacedef.impl,javax.xml.ws";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397232156
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -27,23 +27,23 @@ Import-Package: javax.jws,
  javax.xml.transform;resolution:=optional,
  javax.xml.transform.stream;resolution:=optional,
  javax.xml.ws,
- org.apache.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.databinding;version="1.4",
- org.apache.tuscany.sca.databinding.annotation;version="1.4",
- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",
- org.apache.tuscany.sca.databinding.jaxb;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.databinding;version="2.0.0",
+ org.apache.tuscany.sca.databinding.annotation;version="2.0.0",
+ org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
+ org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.objectweb.asm;version="3.1",
  org.objectweb.asm.util;version="3.1";resolution:=optional,
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
index 806a7730dc..d2a7f8884e 100644
--- a/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.interfacedef.java.xml;version=
- "1.4"
+ "2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0"
+ org.apache.tuscany.sca.assembly;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/interface-java/META-INF/MANIFEST.MF b/java/sca/modules/interface-java/META-INF/MANIFEST.MF
index a2f58302b3..4768a5426c 100644
--- a/java/sca/modules/interface-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java/META-INF/MANIFEST.MF
@@ -4,35 +4,35 @@ Export-Package: org.apache.tuscany.sca.interfacedef.java.impl;uses:="o
  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
+ def.impl";version="2.0.0",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
+ cany.sca.interfacedef";version="2.0.0",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"
+ ,javax.xml.namespace";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.osoa.sca.annotations;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF b/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
index eafd4517cd..7a65a62f71 100644
--- a/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.xml;version=
- "1.4"
+ "2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397292156
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -17,21 +17,21 @@ Import-Package: javax.wsdl,
  javax.wsdl.xml,
  javax.xml.namespace,
  javax.xml.stream,
- org.apache.tuscany.sca.assembly;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.contribution;version="1.4",
- 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.definitions;version="1.4.0";resolution:=optional,
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.xsd;version="1.4",
- org.apache.tuscany.sca.xsd.xml;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0",
  org.apache.ws.commons.schema,
  org.w3c.dom,
  org.xml.sax
diff --git a/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF b/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
index 0719e71d94..3af0da9e4e 100644
--- a/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ 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"
+ namespace";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.impl;version
- ="1.4"
+ ="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397282593
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -18,18 +18,18 @@ Bundle-Description: Apache Tuscany SCA WSDL Interface Model
 Import-Package: javax.wsdl,
  javax.wsdl.extensions,
  javax.xml.namespace,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4.0";resolution:=optional,
- org.apache.tuscany.sca.contribution.processor;version="1.4.0";resolution:=optional,
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.interfacedef.impl;version="1.4",
- org.apache.tuscany.sca.interfacedef.util;version="1.4",
- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4.0";resolution:=optional,
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  org.apache.ws.commons.schema
 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/interface/META-INF/MANIFEST.MF b/java/sca/modules/interface/META-INF/MANIFEST.MF
index 50d1eb711a..c639f23508 100644
--- a/java/sca/modules/interface/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 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
+ ="2.0.0",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
+ uscany.sca.interfacedef";version="2.0.0",org.apache.tuscany.sca.interfa
  cedef;uses:="org.apache.tuscany.sca.interfacedef.util,org.apache.tusc
- any.sca.policy";version="1.4"
+ any.sca.policy";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
+ form,org.apache.tuscany.sca.interfacedef;version="2.0.0",org.apache.tus
+ cany.sca.interfacedef.impl;version="2.0.0",org.apache.tuscany.sca.inter
+ facedef.util;version="2.0.0",org.apache.tuscany.sca.policy;version="1.4
  ",org.apache.tuscany.sca.core;ve
- rsion="1.4";resolution:=optional
+ rsion="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.interface
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/monitor/META-INF/MANIFEST.MF b/java/sca/modules/monitor/META-INF/MANIFEST.MF
index 131bbcaf52..61652db813 100644
--- a/java/sca/modules/monitor/META-INF/MANIFEST.MF
+++ b/java/sca/modules/monitor/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.monitor;version="1.4"
-Private-Package: org.apache.tuscany.sca.monitor.impl;version="1.4"
+Export-Package: org.apache.tuscany.sca.monitor;version="2.0.0"
+Private-Package: org.apache.tuscany.sca.monitor.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.monitor;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.monitor
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/node-api/META-INF/MANIFEST.MF b/java/sca/modules/node-api/META-INF/MANIFEST.MF
index 077bca13a3..a46baa9c4a 100644
--- a/java/sca/modules/node-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-api/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.node;uses:="org.osoa.sca";versi
- on="1.4"
+ on="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",org.osoa.sca
+ ;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.node.api
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
index 4cca47bacd..f851844270 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -8,39 +8,39 @@ Export-Package: org.apache.tuscany.sca.node.impl;uses:="org.apache.tus
  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"
+ y.sca.work,org.apache.tuscany.sca.contribution.processor";version="2.0.
+ 0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.assembly.builder;version="1.4",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.implementation.node;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.node;version="1.4",
- org.apache.tuscany.sca.node.impl;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4.0",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.apache.tuscany.sca.work;version="1.4",
- org.apache.tuscany.sca.workspace;version="1.4",
- org.apache.tuscany.sca.workspace.builder;version="1.4",
- org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.implementation.node;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.node.impl;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0",
+ org.apache.tuscany.sca.workspace;version="2.0.0",
+ org.apache.tuscany.sca.workspace.builder;version="2.0.0",
+ org.osoa.sca;version="2.0.0",
+ org.osoa.sca.annotations;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/java/sca/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 37d3c72d1b..bd930190dd 100644
--- a/java/sca/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-launcher-equinox/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.node.equinox.launcher;uses:="or
- g.osgi.framework,org.eclipse.core.runtime.adaptor";version="1.4"
+ g.osgi.framework,org.eclipse.core.runtime.adaptor";version="2.0.0"
 Eclipse-AutoStart: true
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Node Equinox OSGi Launcher
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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",
+Import-Package: org.apache.tuscany.sca.node.equinox.launcher;version="2.0.0",
  org.eclipse.core.runtime.adaptor,
  org.osgi.framework;version="1.4"
 Bundle-SymbolicName: org.apache.tuscany.sca.node.launcher.equinox
diff --git a/java/sca/modules/node-launcher/META-INF/MANIFEST.MF b/java/sca/modules/node-launcher/META-INF/MANIFEST.MF
index 6827dde638..c0d0f9d222 100644
--- a/java/sca/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-launcher/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.node.launcher;uses:="javax.serv
- let";version="1.4"
+ let";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Node Launcher
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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"
+ sion="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.node.launcher
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/node-manager/META-INF/MANIFEST.MF b/java/sca/modules/node-manager/META-INF/MANIFEST.MF
index 4bd395d6f6..872623184f 100644
--- a/java/sca/modules/node-manager/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-manager/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 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"
+ rg.osoa.sca,javax.servlet.http";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+ .apache.tuscany.sca.data.collection;version="2.0.0",org.apache.tuscany.
+ sca.implementation.node.manager;version="2.0.0",org.apache.tuscany.sca.
+ node.launcher;version="2.0.0",org.osoa.sca;version="2.0.0",org.osoa.sca.a
+ nnotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.node.manager
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/policy-logging/META-INF/MANIFEST.MF b/java/sca/modules/policy-logging/META-INF/MANIFEST.MF
index 0bead60d14..df410e306f 100644
--- a/java/sca/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-logging/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.policy.logging;version="1.4",o
- rg.apache.tuscany.sca.policy.logging.jdk;version="1.4"
+Private-Package: org.apache.tuscany.sca.policy.logging;version="2.0.0",o
+ rg.apache.tuscany.sca.policy.logging.jdk;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.logging
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF
index 0ac36efa2a..162c6b33bf 100644
--- a/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.policy.jsr250;version="1.4",or
- g.apache.tuscany.sca.policy.jsr250.introspect.impl;version="1.4"
+Private-Package: org.apache.tuscany.sca.policy.jsr250;version="2.0.0",or
+ g.apache.tuscany.sca.policy.jsr250.introspect.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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",org.apache.tuscany.sca.implementation.java.introspect.
- impl;resolution:=optional,org.osoa.sca.annotations;version="1.4";reso
+ he.tuscany.sca.assembly;version="2.0.0",org.apache.tuscany.sca.core;ver
+ sion="1.4",org.apache.tuscany.sca.implementation.java;version="2.0.0",o
+ rg.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",or
+ g.apache.tuscany.sca.policy;version="2.0.0",org.apache.tuscany.sca.poli
+ cy.authorization;version="2.0.0",org.apache.tuscany.sca.policy.identity
+ ;version="2.0.0",org.apache.tuscany.sca.implementation.java.introspect.
+ impl;resolution:=optional,org.osoa.sca.annotations;version="2.0.0";reso
  lution:=optional,org.apache.tuscany.sca.interfacedef.java;version="1.
  4";resolution:=optional,org.apache.tuscany.sca.interfacedef;version="
  1.4";resolution:=optional,org.ap
- ache.tuscany.sca.interfacedef.java.impl;version="1.4";resolution:=opt
+ ache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=opt
  ional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.jsr250
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/policy-security/META-INF/MANIFEST.MF b/java/sca/modules/policy-security/META-INF/MANIFEST.MF
index d36fe873a1..4ec003206b 100644
--- a/java/sca/modules/policy-security/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-security/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ 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
+ espace";version="2.0.0",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
@@ -11,27 +11,27 @@ Export-Package: org.apache.tuscany.sca.policy.authorization;uses:="jav
  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
+ a.sca";version="2.0.0",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
+ ,org.apache.tuscany.sca.contribution.processor";version="2.0.0",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
+ any.sca.core";version="2.0.0",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",org.apache.tuscany.sca.policy.authentic
- ation.token;version="1.4"
+ .xml.namespace";version="2.0.0",org.apache.tuscany.sca.policy.authentic
+ ation.token;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397295515
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -40,25 +40,25 @@ Import-Package: javax.security.auth.callback,
  javax.security.auth.login,
  javax.xml.namespace,
  javax.xml.stream,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.definitions.util;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.authentication.basic;version="1.4",
- org.apache.tuscany.sca.policy.authorization;version="1.4",
- org.apache.tuscany.sca.policy.identity;version="1.4",
- org.apache.tuscany.sca.policy.security;version="1.4",
- org.apache.tuscany.sca.policy.security.jaas;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
- org.osoa.sca;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.definitions.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",
+ org.apache.tuscany.sca.policy.authorization;version="2.0.0",
+ org.apache.tuscany.sca.policy.identity;version="2.0.0",
+ org.apache.tuscany.sca.policy.security;version="2.0.0",
+ org.apache.tuscany.sca.policy.security.jaas;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.osoa.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.security
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/policy-transaction/META-INF/MANIFEST.MF b/java/sca/modules/policy-transaction/META-INF/MANIFEST.MF
index c847400657..7a81ed85eb 100644
--- a/java/sca/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-transaction/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397486843
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -26,19 +26,19 @@ Import-Package: javax.resource.spi,
  
  org.apache.geronimo.transaction.log,
  org.apache.geronimo.transaction.manager,
- org.apache.tuscany.sca.assembly;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.definitions;version="1.4",
- org.apache.tuscany.sca.definitions.util;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4",
- org.apache.tuscany.sca.invocation;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.transaction;version="1.4",
- org.apache.tuscany.sca.provider;version="1.4",
- org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.definitions.util;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.transaction;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
  org.objectweb.howl.log;version="1.0.1"
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/policy-xml-ws/META-INF/MANIFEST.MF b/java/sca/modules/policy-xml-ws/META-INF/MANIFEST.MF
index 6241096ee8..41535c9124 100644
--- a/java/sca/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-xml-ws/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.policy.xml.ws;version="1.4"
+Private-Package: org.apache.tuscany.sca.policy.xml.ws;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397120421
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -13,12 +13,12 @@ Import-Package: javax.xml.namespace,
  javax.xml.stream,
  org.apache.axiom.om,
  org.apache.neethi,
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,
- org.apache.tuscany.sca.policy.xml;version="1.4";resolution:=optional
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.policy.xml;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml.ws
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/policy-xml/META-INF/MANIFEST.MF b/java/sca/modules/policy-xml/META-INF/MANIFEST.MF
index 7bb16d73d9..3e5ce44e75 100644
--- a/java/sca/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-xml/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.policy.xml;version="1.4"
+Private-Package: org.apache.tuscany.sca.policy.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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"
+ rg.apache.tuscany.sca.contribution.processor;version="2.0.0",org.apache
+ .tuscany.sca.contribution.resolver;version="2.0.0",org.apache.tuscany.s
+ ca.core;version="2.0.0",org.apache.tuscany.sca.monitor;version="2.0.0",or
+ g.apache.tuscany.sca.policy;version="2.0.0",org.apache.tuscany.sca.poli
+ cy.impl;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/policy/META-INF/MANIFEST.MF b/java/sca/modules/policy/META-INF/MANIFEST.MF
index 1edbc88f0b..ce038e7d05 100644
--- a/java/sca/modules/policy/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 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",
+ .xpath,javax.xml.transform,javax.xml.transform.stream";version="2.0.0",
  org.apache.tuscany.sca.policy.impl;uses:="javax.xml.xpath,org.apache.
- tuscany.sca.policy,javax.xml.namespace";version="1.4",org.apache.tusc
+ tuscany.sca.policy,javax.xml.namespace";version="2.0.0",org.apache.tusc
  any.sca.policy;uses:="javax.xml.xpath,org.apache.tuscany.sca.policy.i
- mpl,javax.xml.namespace";version="1.4"
+ mpl,javax.xml.namespace";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397083703
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -22,10 +22,10 @@ Import-Package: javax.xml.namespace,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  javax.xml.xpath,
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.policy;version="1.4",
- org.apache.tuscany.sca.policy.impl;version="1.4",
- org.apache.tuscany.sca.policy.util;version="1.4",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.policy.impl;version="2.0.0",
+ org.apache.tuscany.sca.policy.util;version="2.0.0",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.policy
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/sca-api/META-INF/MANIFEST.MF b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
index d0585ad7d4..b8b81f1930 100644
--- a/java/sca/modules/sca-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Export-Package: org.osoa.sca.annotations;version="1.4",org.osoa.sca;us
- es:="javax.security.auth";version="1.4"
+Export-Package: org.osoa.sca.annotations;version="2.0.0",org.osoa.sca;us
+ es:="javax.security.auth";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA API
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
+Bundle-Version: 2.0.0
 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"
+Import-Package: javax.security.auth,org.osoa.sca;version="2.0.0",org.oso
+ a.sca.annotations;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.api
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/tracing-aspectj/META-INF/MANIFEST.MF b/java/sca/modules/tracing-aspectj/META-INF/MANIFEST.MF
index 061d0ad3e7..5a415a3fe4 100644
--- a/java/sca/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/java/sca/modules/tracing-aspectj/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.aspectj;version="1.4"
+Private-Package: org.apache.tuscany.sca.aspectj;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397489546
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF b/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF
index f4b41fe87d..aa61a89d61 100644
--- a/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 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"
+ ="2.0.0",org.apache.tuscany.sca.workspace.processor.impl;version="2.0.0",
+ org.apache.tuscany.sca.workspace.scanner.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.contribution.scanner;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.workspace;version="1.4",
- org.apache.tuscany.sca.workspace.builder;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.contribution.scanner;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.workspace;version="2.0.0",
+ org.apache.tuscany.sca.workspace.builder;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.impl
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/workspace-xml/META-INF/MANIFEST.MF b/java/sca/modules/workspace-xml/META-INF/MANIFEST.MF
index cb5af2f786..cc2a960421 100644
--- a/java/sca/modules/workspace-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/workspace-xml/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.workspace.xml;version="1.4"
+Private-Package: org.apache.tuscany.sca.workspace.xml;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.workspace;version="1.4"
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.workspace;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/workspace/META-INF/MANIFEST.MF b/java/sca/modules/workspace/META-INF/MANIFEST.MF
index e9a9bf0742..edc45295b6 100644
--- a/java/sca/modules/workspace/META-INF/MANIFEST.MF
+++ b/java/sca/modules/workspace/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.workspace;uses:="org.apache.tus
- cany.sca.contribution";version="1.4",org.apache.tuscany.sca.workspace
+ cany.sca.contribution";version="2.0.0",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"
+ nitor,org.apache.tuscany.sca.extensibility";version="2.0.0"
+Private-Package: org.apache.tuscany.sca.workspace.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.extensibility;version="1.4",
- org.apache.tuscany.sca.interfacedef;version="1.4.0",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.workspace;version="1.4",
- org.apache.tuscany.sca.workspace.builder;version="1.4"
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.workspace;version="2.0.0",
+ org.apache.tuscany.sca.workspace.builder;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.workspace
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/xsd-xml/META-INF/MANIFEST.MF b/java/sca/modules/xsd-xml/META-INF/MANIFEST.MF
index 0453a2ce74..40b5d79e03 100644
--- a/java/sca/modules/xsd-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/xsd-xml/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Export-Package: org.apache.tuscany.sca.xsd.xml;uses:="org.apache.ws.co
  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"
+ rg.apache.tuscany.sca.xsd";version="2.0.0"
 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
+Bundle-Version: 2.0.0
 Bnd-LastModified: 1225397288437
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -18,15 +18,15 @@ Bundle-Description: Apache Tuscany SCA XSD XML Processor
 Import-Package: javax.xml.namespace,
  javax.xml.stream,
  
- org.apache.tuscany.sca.assembly;version="1.4.0",
- org.apache.tuscany.sca.contribution;version="1.4",
- org.apache.tuscany.sca.contribution.namespace;version="1.4",
- org.apache.tuscany.sca.contribution.processor;version="1.4",
- org.apache.tuscany.sca.contribution.resolver;version="1.4",
- org.apache.tuscany.sca.core;version="1.4",
- org.apache.tuscany.sca.monitor;version="1.4",
- org.apache.tuscany.sca.xsd;version="1.4",
- org.apache.tuscany.sca.xsd.xml;version="1.4",
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0",
  org.apache.ws.commons.schema,
  org.apache.ws.commons.schema.resolver,
  
diff --git a/java/sca/modules/xsd/META-INF/MANIFEST.MF b/java/sca/modules/xsd/META-INF/MANIFEST.MF
index 0d5adca756..f1607529d1 100644
--- a/java/sca/modules/xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/xsd/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
 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"
+ ace";version="2.0.0"
+Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.0.0"
 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
+Bundle-Version: 2.0.0
 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
+ rsion="2.0.0",org.apache.tuscany.sca.xsd;version="2.0.0",org.apache.ws.co
  mmons.schema,org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.xsd
 Bundle-DocURL: http://www.apache.org/