67 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/vtest/assembly/component/pom.xml b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/pom.xml
index 259aa61abf..259aa61abf 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/pom.xml
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
index f5832aa7ce..f5832aa7ce 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
index 87de618ad3..87de618ad3 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
index 5d3bbb26c3..5d3bbb26c3 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
index 7cc63afee1..7cc63afee1 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
index 899f84b2dd..899f84b2dd 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
index 86a7be9cc0..86a7be9cc0 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/component.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
index 0f859f908f..0f859f908f 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
index 00f3d00a2d..00f3d00a2d 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
index b4d2abc011..b4d2abc011 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
index 7d49f8baf1..7d49f8baf1 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 6f02d7e941..6f02d7e941 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index 2d245d10a8..2d245d10a8 100644
--- a/branches/sca-java-1.4/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/pom.xml b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/pom.xml
index a9b6732093..a9b6732093 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/pom.xml
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
index 506e79b793..506e79b793 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
index 61b4293940..61b4293940 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
index e8138091bb..e8138091bb 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
index 058726dbd7..058726dbd7 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
index 097f80644b..097f80644b 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
index 623a8d650b..623a8d650b 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
index c39dde6c89..c39dde6c89 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
index d52afacf77..d52afacf77 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
index ae3d8ab557..ae3d8ab557 100644
--- a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
index 603ff7646c..603ff7646c 100644
--- a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
index f7ae2fd562..f7ae2fd562 100644
--- a/branches/sca-java-1.4/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.4/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
index 88b8212c5e..88b8212c5e 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/compositecopy.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/compositecopy.composite
index 9956452116..9956452116 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/compositecopy.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/compositecopy.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
index e9cf2710d3..e9cf2710d3 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
index ccbdcefcf1..ccbdcefcf1 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/dservicews.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/dservicews.composite
index 2e05a862ff..2e05a862ff 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/dservicews.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/dservicews.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/localcomponent.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/localcomponent.composite
index b41bf6b9b9..b41bf6b9b9 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/localcomponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/localcomponent.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
index 5436e6b22a..5436e6b22a 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
index 261246dd1b..261246dd1b 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference.composite
index d6ec215eb5..d6ec215eb5 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
index 603061c7b0..603061c7b0 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
index 4b7a1e09fb..4b7a1e09fb 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
index 82a14e70dd..82a14e70dd 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
index 35a1724bdb..35a1724bdb 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
index 77f800ad33..77f800ad33 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.4/vtest/assembly/ctypefile/pom.xml b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/pom.xml
index 6481067fe8..6481067fe8 100644
--- a/branches/sca-java-1.4/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 889bb846ba..889bb846ba 100644
--- a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index f8f7e45f61..f8f7e45f61 100644
--- a/branches/sca-java-1.4/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-java-1.4/vtest/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/pom.xml
index cf81b32135..cf81b32135 100644
--- a/branches/sca-java-1.4/vtest/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/pom.xml