summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/assembly-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/assembly-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/assembly-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml (renamed from branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml)0
41 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
index 1f86fc1fd6..1f86fc1fd6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 14f81b655b..14f81b655b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 46a50ac4b8..46a50ac4b8 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index d0d11cd02b..d0d11cd02b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 023960be8b..023960be8b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index ab3240b9a9..ab3240b9a9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 72744259f6..72744259f6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index a6b12cc9b6..a6b12cc9b6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index c21bd2cdc9..c21bd2cdc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 0ead2caefb..0ead2caefb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 1ef83bc5f4..1ef83bc5f4 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 7dd95e3944..7dd95e3944 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index b57f4b87ad..b57f4b87ad 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 6bc190aaf5..6bc190aaf5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 63c5668b00..63c5668b00 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index f5d8d5b84c..f5d8d5b84c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index c3fdeb748b..c3fdeb748b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index ea082eec0b..ea082eec0b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 123940b1c5..123940b1c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 8f821d7126..8f821d7126 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 2c6f32c3e7..2c6f32c3e7 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index fb73b337a3..fb73b337a3 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 3224176d6e..3224176d6e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index 147132cade..147132cade 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 1f8579a472..1f8579a472 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index af51468791..af51468791 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 77166c9ac2..77166c9ac2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 42b9f5db9c..42b9f5db9c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index db379c0ac6..db379c0ac6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml