Moving 1.x branches

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

57 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
index 72b511232f..72b511232f 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
index 694e9917a7..694e9917a7 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
index e5588cb9f9..e5588cb9f9 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
index a01b897dcf..a01b897dcf 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
index e9cf2710d3..e9cf2710d3 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
index ccbdcefcf1..ccbdcefcf1 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
index c418f912ce..c418f912ce 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
index 038702720f..038702720f 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
index 43fb488282..43fb488282 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
index a46d21c9a7..a46d21c9a7 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
index a16b71cb68..a16b71cb68 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
index 2e05a862ff..2e05a862ff 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
index b41bf6b9b9..b41bf6b9b9 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
index 5436e6b22a..5436e6b22a 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
index 642e558b9c..642e558b9c 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
index 4166666536..4166666536 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
index 61183d26cc..61183d26cc 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
index 5e68c0c675..5e68c0c675 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
index 3dcaf9e2e7..3dcaf9e2e7 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
index 938c499910..938c499910 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
index 5e4a513fc9..5e4a513fc9 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
index 53f61fbf8c..53f61fbf8c 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
index 7babfcec1f..7babfcec1f 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
index 81dc49f96e..81dc49f96e 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
index c215dc0a5c..c215dc0a5c 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
index f2595c9798..f2595c9798 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
index e8120025fa..e8120025fa 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
index 9b3d773b73..9b3d773b73 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
index 0c35b9348a..0c35b9348a 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
index 62e712f533..62e712f533 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
index ac63024161..ac63024161 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
index df2c01429e..df2c01429e 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
index 7eac450d23..7eac450d23 100644
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
diff --git a/branches/sca-java-1.5/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/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/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/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java