Moving 1.x trunk

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

70 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
index f5832aa7ce..f5832aa7ce 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
index 87de618ad3..87de618ad3 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
index 5d3bbb26c3..5d3bbb26c3 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
index 65d97d0ab6..65d97d0ab6 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
index 214e9c5737..214e9c5737 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/binding_resolution.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/binding_resolution.composite
index d113ba26c3..d113ba26c3 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/binding_resolution.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/binding_resolution.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/callback_bindings.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/callback_bindings.composite
index 29dc96098e..29dc96098e 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/callback_bindings.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/callback_bindings.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
index 0886c94a90..0886c94a90 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_1.composite
index 5e975e5105..5e975e5105 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_1.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_2.composite
index 42d7234a1c..42d7234a1c 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_2.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_3.composite
index c6b0d2f245..c6b0d2f245 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/component_property_3.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
index 0f859f908f..0f859f908f 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
index 00f3d00a2d..00f3d00a2d 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
index b4d2abc011..b4d2abc011 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
index 3f57e56cf5..3f57e56cf5 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType b/sca-java-1.x/trunk/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.x/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
index 396aa0557c..396aa0557c 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
index 7cf1d0b2e8..7cf1d0b2e8 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
index eb4c820ca0..eb4c820ca0 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
index 0895f2b7ce..0895f2b7ce 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
index e5e492f34b..e5e492f34b 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename.composite
index 9544c947d1..9544c947d1 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_1.composite
index e7445c4a2a..e7445c4a2a 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_1.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_2.composite
index bf39310764..bf39310764 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_2.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_3.composite
index e2ef1947e8..e2ef1947e8 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_3.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_4.composite
index 5ef8367193..5ef8367193 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/referencename_4.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 9465cedaf9..9465cedaf9 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-1.x/trunk/vtest/assembly/component/src/main/resources/zeroimplelements.composite