109 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/pom.xml
index 55076f0f5e..55076f0f5e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 8cadb2420e..8cadb2420e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 6a4bb82953..6a4bb82953 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index 3c88ac9272..3c88ac9272 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index e8342ee7b9..e8342ee7b9 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index cf016617a6..cf016617a6 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e81a11e55a..e81a11e55a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/pom.xml
index dfa0efd5d5..dfa0efd5d5 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 18fc2bbc88..18fc2bbc88 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index 9918ce8fca..9918ce8fca 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-classloader/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/pom.xml
index 7e94f897b8..7e94f897b8 100644
--- a/java/sca-contrib/itest/contribution-classloader/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/pom.xml
index 094987318a..094987318a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 32b024bccb..32b024bccb 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 0c60e62d35..0c60e62d35 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/pom.xml
index 7050d77a67..7050d77a67 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/pom.xml
index 1202328b00..1202328b00 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/pom.xml
index 51f9efd932..51f9efd932 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/pom.xml
index be3d2f1fb0..be3d2f1fb0 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 05bd7b7138..05bd7b7138 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/pom.xml
index 13d9a7ce58..13d9a7ce58 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/pom.xml
index 6adf9effe5..6adf9effe5 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/pom.xml
index 265376216b..265376216b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/pom.xml
index 36858e953e..36858e953e 100644
--- a/java/sca-contrib/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/pom.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/pom.xml b/sca-java-2.x/contrib/itest/contribution-multiple/pom.xml
index 5ff78b3d48..5ff78b3d48 100644
--- a/java/sca-contrib/itest/contribution-multiple/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/pom.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
index 7e574a7db3..7e574a7db3 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index 7cd950453d..7cd950453d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index e90d10dc24..e90d10dc24 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index 5251fc0a45..5251fc0a45 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
index 133c98f357..133c98f357 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index 790b6fed98..790b6fed98 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
index cbabdcd4fc..cbabdcd4fc 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
index 4c9225de34..4c9225de34 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
diff --git a/java/sca-contrib/itest/contribution/pom.xml b/sca-java-2.x/contrib/itest/contribution/pom.xml
index 1fe5207ad5..1fe5207ad5 100644
--- a/java/sca-contrib/itest/contribution/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution/pom.xml
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 719ad69eef..719ad69eef 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-2.x/contrib/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-2.x/contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar