214 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/pom.xml
index ca54eca210..ca54eca210 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/pom.xml
index b96b2a2482..b96b2a2482 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 692f16f6f6..692f16f6f6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index b123951ef6..b123951ef6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/pom.xml
index 928701e060..928701e060 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-classloader/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/pom.xml
index 74065fb4f5..74065fb4f5 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
index 9f9c15c14d..9f9c15c14d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
index 98bbe3935a..98bbe3935a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index a318cf50d9..a318cf50d9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
index ac88b2ac48..ac88b2ac48 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
index 8b60ae590c..8b60ae590c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
index 7e4a7132a3..7e4a7132a3 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
index 0e16e11b0b..0e16e11b0b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/pom.xml
index 8d731c07d7..8d731c07d7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index e65422136f..e65422136f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 5369c18497..5369c18497 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/pom.xml
index 85c50da029..85c50da029 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/pom.xml
index 8d5eb73174..8d5eb73174 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml
index 1793d8e70a..1793d8e70a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/pom.xml
index 35c0314f65..35c0314f65 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 966f56d7d5..966f56d7d5 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/pom.xml
index 32befa7498..32befa7498 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/pom.xml
index 214231ba18..214231ba18 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml
index 9b60834e53..9b60834e53 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/pom.xml
index 76fedfafc0..76fedfafc0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-import-export/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
index 123c776499..123c776499 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
index 3b1555f567..3b1555f567 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
index fe71740c9c..fe71740c9c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
index b131d375b0..b131d375b0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
index 94795ab129..94795ab129 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
index e7f7422a7d..e7f7422a7d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
index ad9003dc67..ad9003dc67 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
index bcaa154913..bcaa154913 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
index 9a97cbd535..9a97cbd535 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
index 10aa2d8127..10aa2d8127 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
index b5224a2319..b5224a2319 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
index e5e9fe6a82..e5e9fe6a82 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
index a6d7f2dd04..a6d7f2dd04 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
index db36c4b140..db36c4b140 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
index 506652388d..506652388d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
index 4df5cd37de..4df5cd37de 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
index 41ecddb62e..41ecddb62e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
index 403ead623c..403ead623c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
index 97242bff96..97242bff96 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
index 7428735903..7428735903 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/pom.xml
index 0e7836ceb1..0e7836ceb1 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
index 5a08769550..5a08769550 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
index 265af5b3a0..265af5b3a0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
index 81793e47e6..81793e47e6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/pom.xml
index 6ab28e497d..6ab28e497d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
index 302a758784..302a758784 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
index e9346fb2bb..e9346fb2bb 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
index 718a745068..718a745068 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
index ebd8377725..ebd8377725 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
index c29d0c58ce..c29d0c58ce 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
index 79c9dd3243..79c9dd3243 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
index 67241cc12e..67241cc12e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
index 909b8a1484..909b8a1484 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
index f88d68876d..f88d68876d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
index eaa567595e..eaa567595e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
index f5295b7388..f5295b7388 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
index ae8613f8db..ae8613f8db 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
index 823085e81f..823085e81f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
index aa14813a14..aa14813a14 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
index 71055bbdfe..71055bbdfe 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/pom.xml
index 7f245e2da5..7f245e2da5 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
index e7e1d90797..e7e1d90797 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
index 4660fee7fd..4660fee7fd 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
index 34bf3702d3..34bf3702d3 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index a39171507c..a39171507c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index adc93d9015..adc93d9015 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
index b81f67c287..b81f67c287 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
index 4241b7928f..4241b7928f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
index 64c31b4393..64c31b4393 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
index 9f50ea573c..9f50ea573c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
index 97e23d1bf7..97e23d1bf7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
index db4d9e5bf6..db4d9e5bf6 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
index 211f51c9bd..211f51c9bd 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
index 7696b64f9c..7696b64f9c 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
index f54a4f98df..f54a4f98df 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
index 11d2a029ec..11d2a029ec 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
index a5b160c875..a5b160c875 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
index 9fb1ed9d14..9fb1ed9d14 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
index 3a704137ed..3a704137ed 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
index 228f4d27d7..228f4d27d7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
index 0b75db2745..0b75db2745 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
index 938ea75941..938ea75941 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
index 24f55a5f63..24f55a5f63 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear
index c912e64237..c912e64237 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/pom.xml
index 2dd332dcc2..2dd332dcc2 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/Hello.java
index 7e574a7db3..7e574a7db3 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index 5251fc0a45..5251fc0a45 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
index 133c98f357..133c98f357 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index 790b6fed98..790b6fed98 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
index cbabdcd4fc..cbabdcd4fc 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
index 4c9225de34..4c9225de34 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/pom.xml
index e41db401dc..e41db401dc 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/pom.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/pom.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 719ad69eef..719ad69eef 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/tags/java/sca/1.5.1-RC1/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution/src/test/resources/repository/sample-calculator.jar