152 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/pom.xml
index 094cca9d90..094cca9d90 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/pom.xml
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
index f5832aa7ce..f5832aa7ce 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
index 87de618ad3..87de618ad3 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
index 5d3bbb26c3..5d3bbb26c3 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
index 65d97d0ab6..65d97d0ab6 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
index 214e9c5737..214e9c5737 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
index 17df0503d9..17df0503d9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
index b36f4f4d75..b36f4f4d75 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
index 7c9ad7a98e..7c9ad7a98e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
index 78c59048ea..78c59048ea 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
index 07c321d8e4..07c321d8e4 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
index 98f0291be3..98f0291be3 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
index 8c0d08d052..8c0d08d052 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
index 424e245fea..424e245fea 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
index b2b420ed6a..b2b420ed6a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
index fce89b7bb9..fce89b7bb9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
index 4adb361ee5..4adb361ee5 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
index 2e83612497..2e83612497 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
index d29eb41dfb..d29eb41dfb 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
index dfd613d798..dfd613d798 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
index d57894527d..d57894527d 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
index f202906d7c..f202906d7c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
index 1eefede818..1eefede818 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
index bfbc1848c2..bfbc1848c2 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
index 85bd9bf22c..85bd9bf22c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
index a1948990a9..a1948990a9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
index 286dcb26c9..286dcb26c9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
index bc60a8253f..bc60a8253f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
index 9ef398dcd0..9ef398dcd0 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
index 67a2ca395c..67a2ca395c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
index 9afd505017..9afd505017 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
index e1523ae587..e1523ae587 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
index 78896eb607..78896eb607 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
index 199e975017..199e975017 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
index d1ca487168..d1ca487168 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
index b6bb38500a..b6bb38500a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
index d3e5881f0a..d3e5881f0a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite
index d113ba26c3..d113ba26c3 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
index 29dc96098e..29dc96098e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
index 0886c94a90..0886c94a90 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite
index 5e975e5105..5e975e5105 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite
index 42d7234a1c..42d7234a1c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
index c6b0d2f245..c6b0d2f245 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
index 0f859f908f..0f859f908f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
index 00f3d00a2d..00f3d00a2d 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
index b4d2abc011..b4d2abc011 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
index 3f57e56cf5..3f57e56cf5 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
index 7cc63afee1..7cc63afee1 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
index 899f84b2dd..899f84b2dd 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
index 86a7be9cc0..86a7be9cc0 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
index 09cf5881a2..09cf5881a2 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
index 396aa0557c..396aa0557c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
index 7cf1d0b2e8..7cf1d0b2e8 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
index eb4c820ca0..eb4c820ca0 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
index 0895f2b7ce..0895f2b7ce 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
index e5e492f34b..e5e492f34b 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename.composite
index 9544c947d1..9544c947d1 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite
index e7445c4a2a..e7445c4a2a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite
index bf39310764..bf39310764 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite
index e2ef1947e8..e2ef1947e8 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite
index 5ef8367193..5ef8367193 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 9465cedaf9..9465cedaf9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
index 69b7377986..69b7377986 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
index 6cf8b49e4f..6cf8b49e4f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
index 5dd1969016..5dd1969016 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index 2d245d10a8..2d245d10a8 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/pom.xml
index a4109862f0..a4109862f0 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/pom.xml
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
index 506e79b793..506e79b793 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
index 61b4293940..61b4293940 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
index 6d2c7e5963..6d2c7e5963 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
index 8333d69c9e..8333d69c9e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
index 7424fd215c..7424fd215c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
index 7e61beec62..7e61beec62 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
index 058726dbd7..058726dbd7 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
index 3c41255657..3c41255657 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
index a32b72b7de..a32b72b7de 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
index 4a87abb98a..4a87abb98a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
index 95e7e1ef75..95e7e1ef75 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
index c39dde6c89..c39dde6c89 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
index 5b67c87ee1..5b67c87ee1 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
index a9d4a1c872..a9d4a1c872 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
index b651f21927..b651f21927 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
index 3c23e3887a..3c23e3887a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
index e307302395..e307302395 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
index 77b8dbc526..77b8dbc526 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
index 6d683be9f7..6d683be9f7 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
index e1ee25c88b..e1ee25c88b 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
index a030170fb5..a030170fb5 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
index 1439bd5ca2..1439bd5ca2 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
index 262f46b40a..262f46b40a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/composite.composite
index 72b511232f..72b511232f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositeb.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositeb.composite
index 694e9917a7..694e9917a7 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositeb.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositeb.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositec.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositec.composite
index e5588cb9f9..e5588cb9f9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositec.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositec.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositecopy.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositecopy.composite
index a01b897dcf..a01b897dcf 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositecopy.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/compositecopy.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
index e9cf2710d3..e9cf2710d3 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
index ccbdcefcf1..ccbdcefcf1 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentlocalwire.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
index c418f912ce..c418f912ce 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
index 038702720f..038702720f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
index 43fb488282..43fb488282 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
index a46d21c9a7..a46d21c9a7 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
index a16b71cb68..a16b71cb68 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/dservicews.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/dservicews.composite
index 2e05a862ff..2e05a862ff 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/dservicews.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/dservicews.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/localcomponent.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/localcomponent.composite
index b41bf6b9b9..b41bf6b9b9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/localcomponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/localcomponent.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
index 5436e6b22a..5436e6b22a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
index 642e558b9c..642e558b9c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
index 4166666536..4166666536 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
index 61183d26cc..61183d26cc 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
index 5e68c0c675..5e68c0c675 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
index 3dcaf9e2e7..3dcaf9e2e7 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
index 938c499910..938c499910 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
index 5e4a513fc9..5e4a513fc9 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
index 53f61fbf8c..53f61fbf8c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
index 7babfcec1f..7babfcec1f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_inner.composite
index 81dc49f96e..81dc49f96e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_outer.composite
index c215dc0a5c..c215dc0a5c 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/reference_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_inner.composite
index f2595c9798..f2595c9798 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_outer.composite
index e8120025fa..e8120025fa 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/service_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subinterfacewire.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
index 9b3d773b73..9b3d773b73 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
index 0c35b9348a..0c35b9348a 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
index 62e712f533..62e712f533 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
index ac63024161..ac63024161 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
index df2c01429e..df2c01429e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/wire.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/wire.composite
index 7eac450d23..7eac450d23 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/wire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/main/resources/wire.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
index c47896437e..c47896437e 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/pom.xml
index 2717b169fa..2717b169fa 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
index 3664d67299..3664d67299 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
index 0d2dcb580b..0d2dcb580b 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
index 0f24201970..0f24201970 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
index fd32cb1f9b..fd32cb1f9b 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
index 659eff8798..659eff8798 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
index dce6e24902..dce6e24902 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
index 715e22b318..715e22b318 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
index a8ae946647..a8ae946647 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
index 173203ae21..173203ae21 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index c6a0f274c4..c6a0f274c4 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
index 4a0fed82ac..4a0fed82ac 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
index e639b55986..e639b55986 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
index 47e7a4b6ea..47e7a4b6ea 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 634101d95b..634101d95b 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index d2d2257277..d2d2257277 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-java-1.5.1/vtest/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/pom.xml
index 6198f95c88..6198f95c88 100644
--- a/branches/sca-java-1.5.1/vtest/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/vtest/assembly/pom.xml