106 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
index 9f3b84ad7a..9f3b84ad7a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
index 0ee17cbae6..0ee17cbae6 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 5f92342b8c..5f92342b8c 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 05da52edc6..05da52edc6 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index e0c11cdbee..e0c11cdbee 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
index c9ca36e531..c9ca36e531 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
index 597b7b3fa2..597b7b3fa2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 44614f243a..44614f243a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
index 9ef7139f3a..9ef7139f3a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index 7e11adcec7..7e11adcec7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
index 129a06095f..129a06095f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
index 8586f9e81a..8586f9e81a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index 8254b667f2..8254b667f2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
index 3697a228d7..3697a228d7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 130aa91093..130aa91093 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 3cc6784eca..3cc6784eca 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
index 408807e5ea..408807e5ea 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index be9bbc6cad..be9bbc6cad 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9bc94525e0..9bc94525e0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
index f775805b8d..f775805b8d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
index f4d03f0184..f4d03f0184 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index a47b9a71e9..a47b9a71e9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 66227eacaa..66227eacaa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
index 5bc4bc57a7..5bc4bc57a7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
index 15b4a2b79b..15b4a2b79b 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
index 313a58a0bf..313a58a0bf 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index a84a578344..a84a578344 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index c1df23ce14..c1df23ce14 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/pom.xml
index bf9d32d8a7..bf9d32d8a7 100644
--- a/branches/sca-java-1.2.1/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
index ff475408ef..ff475408ef 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 616867ca31..616867ca31 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
index f25d66c80f..f25d66c80f 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
index 709afc9460..709afc9460 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
index 4a1d69d060..4a1d69d060 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
index f0caeafe7f..f0caeafe7f 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index 2d5157cf57..2d5157cf57 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index b26c9ad95e..b26c9ad95e 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar