Change MANIFEST.MF version to 2.0 to match trunk build. It turns out this isn't so striaght forward to do as there are quite a few permutations you need to search/replace to catch all the occurances of 1.4 so this is going to make doing releases a bit harder so we may need to find a better way

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

36 files changed, 479 insertions, 479 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..ccfe6de575 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"

 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

 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",org.apache.tuscany.sca.assembly

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

+ org.apache.tuscany.sca.contribution.java;version="2.0",org.apache.tus

+ cany.sca.contribution.namespace;version="2.0",org.apache.tuscany.sca.

+ contribution.processor;version="2.0",org.apache.tuscany.sca.contribut

+ ion.resolver;version="2.0",org.apache.tuscany.sca.core;version="2.0",

+ org.apache.tuscany.sca.definitions;version="2.0",org.apache.tuscany.s

+ ca.interfacedef;version="2.0",org.apache.tuscany.sca.interfacedef.imp

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

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

+ l;version="2.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";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..2e6595f7fa 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

 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..e1aa2f77bd 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"

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

 Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=

- "1.4"

+ "2.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

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

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

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

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

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

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

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

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

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

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

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

  org.w3c.dom,

  org.xml.sax

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

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..4582a90676 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"

 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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.policy;version="2.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 582b72660e..c14e628415 100644
--- a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
@@ -1,33 +1,33 @@
 Manifest-Version: 1.0

 Export-Package: org.apache.tuscany.sca.binding.sca;uses:="org.apache.t

- uscany.sca.assembly";version="1.4"

-Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="1.4"

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

+ uscany.sca.assembly";version="2.0"

+Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="2.0"

+ ,org.apache.tuscany.sca.binding.sca.provider;version="2.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

 Bnd-LastModified: 1225397165593

 Bundle-ManifestVersion: 2

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

 Bundle-Description: Apache Tuscany SCA Default Binding Model

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

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

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

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

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

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

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

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

- osoa.sca;version="1.4",org.apache.tuscany.sca.binding.sca.impl;resolu

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

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

+ binding.sca;version="2.0",org.apache.tuscany.sca.contribution.process

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

+ .tuscany.sca.definitions;version="2.0",org.apache.tuscany.sca.interfa

+ cedef;version="2.0",org.apache.tuscany.sca.invocation;version="2.0",o

+ rg.apache.tuscany.sca.policy;version="2.0",org.apache.tuscany.sca.pro

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

+ osoa.sca;version="2.0",org.apache.tuscany.sca.binding.sca.impl;resolu

  tion:=optional,org.apache.tuscany.sca.assembly.builder.impl;resolutio

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

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

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

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

  :=optional,javax.xml.stream;resolution

  :=optional,org.apache.tuscany.sc

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

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

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

+ sca.contribution.resolver;version="2.0";resolution:=optional

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

 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..5ffdfc3b0a 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"

 Private-Package: org.apache.tuscany.sca.contribution.java.impl;version

- ="1.4"

+ ="2.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

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

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

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

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

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

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

+ org.apache.tuscany.sca.monitor;version="2.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..4f03eaebb5 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"

 Private-Package: org.apache.tuscany.sca.contribution.namespace.impl;ve

- rsion="1.4"

+ rsion="2.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

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

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

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

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

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

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

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

 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 4f8d3ee0f8..09c2a551fd 100644
--- a/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Export-Package: org.apache.tuscany.sca.contribution.xml;uses:="org.apa
  che.tuscany.sca.assembly,org.apache.tuscany.sca.core,org.apache.tusca

  ny.sca.contribution,org.apache.tuscany.sca.monitor,javax.xml.namespac

  e,javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,org.a

- pache.tuscany.sca.contribution.processor";version="1.4"

+ pache.tuscany.sca.contribution.processor";version="2.0"

 Private-Package: org.apache.tuscany.sca.contribution.processor.xml;ver

- sion="1.4"

+ sion="2.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

 Bnd-LastModified: 1225397199187

 Bundle-ManifestVersion: 2

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

@@ -18,14 +18,14 @@ Bundle-Description: Apache Tuscany SCA XML Contribution Model
 Import-Package: javax.xml.namespace,

  javax.xml.parsers,

  javax.xml.stream,

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

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

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

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

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

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

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

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

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

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

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

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

  

  org.w3c.dom,

  org.w3c.dom.traversal

diff --git a/java/sca/modules/contribution/META-INF/MANIFEST.MF b/java/sca/modules/contribution/META-INF/MANIFEST.MF
index d0a5651923..a73a0ea180 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",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",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",org.apache.tuscany.sca.contributio

  n;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contr

- ibution.resolver";version="1.4"

-Private-Package: org.apache.tuscany.sca.contribution.impl;version="1.4

+ ibution.resolver";version="2.0"

+Private-Package: org.apache.tuscany.sca.contribution.impl;version="2.0

  "

 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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.policy;version="2.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..89bb372230 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",org.apache.tuscany.sca.core.databinding.processor;version="1.

+ 4",org.apache.tuscany.sca.core.databinding.transformers;version="2.0"

+ ,org.apache.tuscany.sca.core.databinding.wire;version="2.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  

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

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

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

+ org.osoa.sca.annotations;version="2.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";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..eb09b93bf5 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",

  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",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",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",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",org.apache.tuscan

+ y.sca.work;version="2.0",org.apache.tuscany.sca.management;uses:="org

+ .apache.tuscany.sca.runtime";version="2.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

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

+ org.apache.tuscany.sca.context;version="2.0",

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

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

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

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

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

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

+ org.apache.tuscany.sca.management;version="2.0",

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

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

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

+ org.apache.tuscany.sca.work;version="2.0",

  

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

+ org.osoa.sca;version="2.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 bb0f164a14..2cdef013e6 100644
--- a/java/sca/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  y.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tus

  cany.sca.interfacedef,org.apache.tuscany.sca.invocation,org.apache.tu

  scany.sca.work,org.apache.tuscany.sca.contribution.processor";version

- ="1.4",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.osoa.

+ ="2.0",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.osoa.

  sca.annotations,commonj.work,org.apache.tuscany.sca.work";version="1.

  4",org.apache.tuscany.sca.core.context;uses:="org.apache.tuscany.sca.

  runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contex

@@ -21,7 +21,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  ly,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.contrib

  ution.processor,org.osoa.sca,org.apache.tuscany.sca.core.invocation,o

  rg.apache.tuscany.sca.core.scope,org.apache.tuscany.sca.assembly.buil

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

+ der";version="2.0",org.apache.tuscany.sca.core.factory;version="2.0",

  org.apache.tuscany.sca.core.invocation;uses:="org.apache.tuscany.sca.

  runtime,org.apache.tuscany.sca.interfacedef.util,org.apache.tuscany.s

  ca.assembly,net.sf.cglib.proxy,org.apache.tuscany.sca.provider,org.ap

@@ -30,19 +30,19 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  a,org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.interfa

  cedef,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.a

  ssembly,org.apache.tuscany.sca.work,org.apache.tuscany.sca.core.facto

- ry,org.osoa.sca,org.apache.tuscany.sca.core.scope";version="1.4",org.

+ ry,org.osoa.sca,org.apache.tuscany.sca.core.scope";version="2.0",org.

  apache.tuscany.sca.core.conversation;uses:="org.apache.tuscany.sca.ru

  ntime,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany

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

+ .sca.core.scope";version="2.0",org.apache.tuscany.sca.core.scope;uses

  :="org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.runtime,o

  rg.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.context,or

  g.apache.tuscany.sca.core.invocation,org.apache.tuscany.sca.core.conv

- ersation";version="1.4"

+ ersation";version="2.0"

 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

 Bnd-LastModified: 1225397162265

 Bundle-ManifestVersion: 2

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

@@ -54,36 +54,36 @@ Import-Package: commonj.work,
  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.core.work;version="1.4",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.context;version="2.0",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.work;version="2.0",

  

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

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

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

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

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

 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 f07a915800..e39c9eecd8 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"

 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

 Bnd-LastModified: 1225397221390

 Bundle-ManifestVersion: 2

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

@@ -31,21 +31,21 @@ Import-Package: javax.activation,
  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.apache.tuscany.sca.assembly;version="2.0.0",

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

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

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

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

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

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

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

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

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

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

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

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

  

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

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

  org.w3c.dom,

  org.xml.sax

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

diff --git a/java/sca/modules/databinding/META-INF/MANIFEST.MF b/java/sca/modules/databinding/META-INF/MANIFEST.MF
index 14592efd70..ac6bc25629 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",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",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",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",org.apache.tuscany.sca.databinding.annotation;v

+ ersion="2.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"

 Private-Package: org.apache.tuscany.sca.databinding.externalizable;ver

- sion="1.4"

+ sion="2.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

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

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.xsd;version="2.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..70de3beb32 100644
--- a/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/definitions-xml/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 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"

 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

 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"

+ y.sca.assembly;version="2.0",org.apache.tuscany.sca.contribution.proc

+ essor;version="2.0",org.apache.tuscany.sca.contribution.resolver;vers

+ ion="2.0",org.apache.tuscany.sca.core;version="2.0",org.apache.tuscan

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

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

+ che.tuscany.sca.policy;version="2.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..9ef0098e91 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",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"

+Private-Package: org.apache.tuscany.sca.definitions.impl;version="2.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

 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",org.apache.tuscany.sca.definitions.util;version="2.0",

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

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

 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 4213af72ac..1d40e24c71 100644
--- a/java/sca/modules/endpoint/META-INF/MANIFEST.MF
+++ b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
 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",org.

+ apache.tuscany.sca.endpoint.impl;version="2.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

diff --git a/java/sca/modules/extensibility/META-INF/MANIFEST.MF b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
index 2cca0f0936..7973ce6a44 100644
--- a/java/sca/modules/extensibility/META-INF/MANIFEST.MF
+++ b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 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",org.apache.tuscany.sca.extensibility

+ ;version="2.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

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

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

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

 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..91794eae05 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",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"

 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",org.apache.tuscany.sca.implementation.java.module;vers

+ ion="2.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

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

+ org.apache.tuscany.sca.context;version="2.0",

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.implementation.java;version="2.0",

+ org.apache.tuscany.sca.implementation.java.context;version="2.0",

+ org.apache.tuscany.sca.implementation.java.injection;version="2.0",

+ org.apache.tuscany.sca.implementation.java.introspect;version="2.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",

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

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

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

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

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

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

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

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

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

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

+ org.osoa.sca.annotations;version="2.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 0dd3619b87..6513277b12 100644
--- a/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF
@@ -6,12 +6,12 @@ Export-Package: org.apache.tuscany.sca.implementation.java.xml;uses:="
  ca.interfacedef.java,org.apache.tuscany.sca.monitor,org.apache.tuscan

  y.sca.interfacedef,javax.xml.namespace,javax.xml.stream,org.apache.tu

  scany.sca.assembly.xml,org.apache.tuscany.sca.contribution.resolver,o

- rg.apache.tuscany.sca.contribution.processor";version="1.4"

+ rg.apache.tuscany.sca.contribution.processor";version="2.0"

 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

 Bnd-LastModified: 1225397170750

 Bundle-ManifestVersion: 2

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

@@ -19,21 +19,21 @@ 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.implementation.java.xml;version="1.4",

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.implementation.java;version="2.0",

+ org.apache.tuscany.sca.implementation.java.introspect;version="2.0",

+ org.apache.tuscany.sca.implementation.java.xml;version="2.0",

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

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

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

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

  

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

+ org.osoa.sca.annotations;version="2.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..96d32c1e9e 100644
--- a/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 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",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"

 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",org.apache.tuscany.sca.implementation.java.introspect.impl;v

+ ersion="2.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

 Bnd-LastModified: 1225397153500

 Bundle-ManifestVersion: 2

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

@@ -21,19 +21,19 @@ 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",

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

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

+ org.apache.tuscany.sca.implementation.java;version="2.0",

+ org.apache.tuscany.sca.implementation.java.introspect;version="2.0",

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

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

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

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

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

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

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

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

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

 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 2ac3da8c1d..4b4c856721 100644
--- a/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 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"

 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",org.apache.tuscany.sca.implementation.node.impl;vers

+ ion="2.0",org.apache.tuscany.sca.implementation.node.xml;version="2.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

 Bnd-LastModified: 1225397193593

 Bundle-ManifestVersion: 2

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

@@ -18,19 +18,19 @@ Import-Package: javax.xml.namespace,
  javax.xml.parsers,

  javax.xml.stream,

  javax.xml.transform,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.implementation.node;version="2.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",

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

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

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

 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 6378fdb1ee..b420f7f79d 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"

 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

 Bnd-LastModified: 1225397232156

 Bundle-ManifestVersion: 2

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

@@ -27,24 +27,24 @@ Import-Package: javax.jws,
  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",

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

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

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

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

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

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

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

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

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

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

+ org.osoa.sca.annotations;version="2.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..1cf2b0cc0c 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"

 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

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

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

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

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

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

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

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

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

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

 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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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

 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",org.apache.tus

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

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

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

- rsion="1.4";resolution:=optional

+ rsion="2.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..5c3831927c 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"

+Private-Package: org.apache.tuscany.sca.monitor.impl;version="2.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

 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"

 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..6f7b072a19 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"

 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

 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",org.osoa.sca

+ ;version="2.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 0391a04003..17dc510e42 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ 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

 Bnd-LastModified: 1225397240796

 Bundle-ManifestVersion: 2

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

@@ -22,27 +22,27 @@ 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.apache.tuscany.sca.assembly;version="2.0",

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

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

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

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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.node.impl;version="2.0",

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

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

+ org.apache.tuscany.sca.work;version="2.0",

+ org.apache.tuscany.sca.workspace;version="2.0",

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

  

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

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

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

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

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

 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..fe97e12dd7 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"

 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

 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",org.apache

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

+ ca.core;version="2.0",org.apache.tuscany.sca.monitor;version="2.0",or

+ g.apache.tuscany.sca.policy;version="2.0",org.apache.tuscany.sca.poli

+ cy.impl;version="2.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..298f97d473 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",

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

 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

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

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

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

+ org.apache.tuscany.sca.policy.util;version="2.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..bad814ed6f 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",org.osoa.sca;us

+ es:="javax.security.auth";version="2.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

 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",org.oso

+ a.sca.annotations;version="2.0"

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

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

 

diff --git a/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF b/java/sca/modules/workspace-impl/META-INF/MANIFEST.MF
index f4b41fe87d..f3731a0863 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",org.apache.tuscany.sca.workspace.processor.impl;version="2.0",

+ org.apache.tuscany.sca.workspace.scanner.impl;version="2.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

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

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

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

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

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

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

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

+ org.apache.tuscany.sca.workspace;version="2.0",

+ org.apache.tuscany.sca.workspace.builder;version="2.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..ec705e6470 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"

 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

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

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

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

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

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

+ org.apache.tuscany.sca.workspace;version="2.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..e2cabc6ba7 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",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"

+Private-Package: org.apache.tuscany.sca.workspace.impl;version="2.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

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

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

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

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

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

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

+ org.apache.tuscany.sca.workspace;version="2.0",

+ org.apache.tuscany.sca.workspace.builder;version="2.0"

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

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

 

diff --git a/java/sca/modules/xsd/META-INF/MANIFEST.MF b/java/sca/modules/xsd/META-INF/MANIFEST.MF
index 0d5adca756..63091c87c2 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"

+Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.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

 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",org.apache.tuscany.sca.xsd;version="2.0",org.apache.ws.co

  mmons.schema,org.w3c.dom

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

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