summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java (renamed from branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/pom.xml (renamed from branches/sca-java-2.0-M2/vtest/assembly/pom.xml)0
34 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml
index 6249530c84..6249530c84 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
index ff17a71a3d..ff17a71a3d 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
index e57ed2f951..e57ed2f951 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
index b2b420ed6a..b2b420ed6a 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 6f02d7e941..6f02d7e941 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index 0938708b91..0938708b91 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml
index 65c2c17d87..65c2c17d87 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
index a5cff3972b..a5cff3972b 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
index 39d879e745..39d879e745 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
index dd80c4dc6a..dd80c4dc6a 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
index 4a4aa965ce..4a4aa965ce 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
index c71e2bcc16..c71e2bcc16 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
index 2f091a8ef2..2f091a8ef2 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite
index d533cb8dcf..d533cb8dcf 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
index 03f44e449c..03f44e449c 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml
index 1e6fe1b25d..1e6fe1b25d 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
index 919e5c2953..919e5c2953 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
index fd32cb1f9b..fd32cb1f9b 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
index 173203ae21..173203ae21 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index c6a0f274c4..c6a0f274c4 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 889bb846ba..889bb846ba 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index f8f7e45f61..f8f7e45f61 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/assembly/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/pom.xml
index f6ae2271b6..f6ae2271b6 100644
--- a/branches/sca-java-2.0-M2/vtest/assembly/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/assembly/pom.xml