summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.2.1/modules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java (renamed from branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java)0
-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
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd (renamed from branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/assembly/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/LICENSE (renamed from branches/sca-java-1.2.1/modules/assembly/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/NOTICE (renamed from branches/sca-java-1.2.1/modules/assembly/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/pom.xml (renamed from branches/sca-java-1.2.1/modules/assembly/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory (renamed from branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java (renamed from branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite (renamed from branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-atom/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-atom/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-atom/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-dwr/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-dwr/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-dwr/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator (renamed from branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-ejb/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-ejb/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-ejb/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite (renamed from branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-feed/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-feed/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-feed/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite (renamed from branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-http/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-http/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-http/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html (renamed from branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite (renamed from branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-jms/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-jms/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-jms/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite (renamed from branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite (renamed from branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-notification/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-notification/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-notification/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-rmi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-rmi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-rmi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite (renamed from branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite (renamed from branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-rss/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-rss/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-rss/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType (renamed from branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-sca/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-sca/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar)bin2704 -> 2704 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks)bin1379 -> 1379 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks)bin1379 -> 1379 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks)bin1379 -> 1379 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/LICENSE (renamed from branches/sca-java-1.2.1/modules/binding-ws/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/NOTICE (renamed from branches/sca-java-1.2.1/modules/binding-ws/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/pom.xml (renamed from branches/sca-java-1.2.1/modules/binding-ws/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java (renamed from branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/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/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite (renamed from branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar)bin26901 -> 26901 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar)bin29164 -> 29164 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext (renamed from branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-java/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-java/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-java/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/contribution-java/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/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar (renamed from branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar)bin26901 -> 26901 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/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/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener (renamed from branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-resource/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-resource/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-resource/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/contribution-resource/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/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar (renamed from branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar)bin29164 -> 29164 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-updater/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-updater/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-updater/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar (renamed from branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar)bin29164 -> 29164 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/contribution-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/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/contribution/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/LICENSE (renamed from branches/sca-java-1.2.1/modules/contribution/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/NOTICE (renamed from branches/sca-java-1.2.1/modules/contribution/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/pom.xml (renamed from branches/sca-java-1.2.1/modules/contribution/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint (renamed from branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/LICENSE (renamed from branches/sca-java-1.2.1/modules/core-databinding/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/NOTICE (renamed from branches/sca-java-1.2.1/modules/core-databinding/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/pom.xml (renamed from branches/sca-java-1.2.1/modules/core-databinding/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme (renamed from branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/LICENSE (renamed from branches/sca-java-1.2.1/modules/core-spi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/NOTICE (renamed from branches/sca-java-1.2.1/modules/core-spi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/pom.xml (renamed from branches/sca-java-1.2.1/modules/core-spi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx (renamed from branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint (renamed from branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/LICENSE (renamed from branches/sca-java-1.2.1/modules/core-spring/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/NOTICE (renamed from branches/sca-java-1.2.1/modules/core-spring/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/pom.xml (renamed from branches/sca-java-1.2.1/modules/core-spring/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite (renamed from branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/core/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/LICENSE (renamed from branches/sca-java-1.2.1/modules/core/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/NOTICE (renamed from branches/sca-java-1.2.1/modules/core/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/pom.xml (renamed from branches/sca-java-1.2.1/modules/core/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java (renamed from branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (renamed from branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java (renamed from branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest (renamed from branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl (renamed from branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-json/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-json/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-json/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig (renamed from branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl (renamed from branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/databinding/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/LICENSE (renamed from branches/sca-java-1.2.1/modules/databinding/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/NOTICE (renamed from branches/sca-java-1.2.1/modules/databinding/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/pom.xml (renamed from branches/sca-java-1.2.1/modules/databinding/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint (renamed from branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml (renamed from branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/definitions-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/definitions-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/definitions-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml (renamed from branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/definitions/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/LICENSE (renamed from branches/sca-java-1.2.1/modules/definitions/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/NOTICE (renamed from branches/sca-java-1.2.1/modules/definitions/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/pom.xml (renamed from branches/sca-java-1.2.1/modules/definitions/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint (renamed from branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/domain-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/domain-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/domain-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java (renamed from branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java (renamed from branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java (renamed from branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/domain-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/domain-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/domain-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png)bin718 -> 718 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png)bin296 -> 296 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/domain/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/LICENSE (renamed from branches/sca-java-1.2.1/modules/domain/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/NOTICE (renamed from branches/sca-java-1.2.1/modules/domain/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/pom.xml (renamed from branches/sca-java-1.2.1/modules/domain/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java (renamed from branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/LICENSE (renamed from branches/sca-java-1.2.1/modules/extensibility/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/NOTICE (renamed from branches/sca-java-1.2.1/modules/extensibility/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/pom.xml (renamed from branches/sca-java-1.2.1/modules/extensibility/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java (renamed from branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java (renamed from branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/LICENSE (renamed from branches/sca-java-1.2.1/modules/extension-helper/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/NOTICE (renamed from branches/sca-java-1.2.1/modules/extension-helper/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/pom.xml (renamed from branches/sca-java-1.2.1/modules/extension-helper/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-embedded/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-embedded/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-embedded/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt (renamed from branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-http/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-http/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-http/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-http/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint (renamed from branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-jetty/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-jetty/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-jetty/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html (renamed from branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-osgi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-osgi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-osgi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-rmi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-rmi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-rmi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-tomcat/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-tomcat/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-tomcat/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html (renamed from branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java (renamed from branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/LICENSE (renamed from branches/sca-java-1.2.1/modules/host-webapp/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/NOTICE (renamed from branches/sca-java-1.2.1/modules/host-webapp/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/pom.xml (renamed from branches/sca-java-1.2.1/modules/host-webapp/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties (renamed from branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite (renamed from branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml (renamed from branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-java/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-java/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-java/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite (renamed from branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite (renamed from branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-node/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-node/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-node/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory (renamed from branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-notification/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-notification/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-notification/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType (renamed from branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite (renamed from branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-resource/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-resource/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-resource/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite (renamed from branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-script/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-script/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-script/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb (renamed from branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-spring/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-spring/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-widget/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-widget/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-widget/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite (renamed from branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType (renamed from branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-java/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-java/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-java/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory (renamed from branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-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/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd (renamed from branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory (renamed from branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/interface/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/LICENSE (renamed from branches/sca-java-1.2.1/modules/interface/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/NOTICE (renamed from branches/sca-java-1.2.1/modules/interface/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/pom.xml (renamed from branches/sca-java-1.2.1/modules/interface/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java (renamed from branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java (renamed from branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/node-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/node-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/node-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/node-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/node-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/node-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png)bin296 -> 296 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE (renamed from branches/sca-java-1.2.1/modules/node/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE (renamed from branches/sca-java-1.2.1/modules/node/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml (renamed from branches/sca-java-1.2.1/modules/node/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (renamed from branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-launcher/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-launcher/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java (renamed from branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-logging/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-logging/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-logging/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml (renamed from branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml (renamed from branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-security/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-security/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-security/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml (renamed from branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-transaction/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-transaction/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-transaction/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (renamed from branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/policy/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/LICENSE (renamed from branches/sca-java-1.2.1/modules/policy/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/NOTICE (renamed from branches/sca-java-1.2.1/modules/policy/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/pom.xml (renamed from branches/sca-java-1.2.1/modules/policy/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java (renamed from branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory (renamed from branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory (renamed from branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java (renamed from branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/pom.xml (renamed from branches/sca-java-1.2.1/modules/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar)bin4723 -> 4723 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties (renamed from branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html (renamed from branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/LICENSE (renamed from branches/sca-java-1.2.1/modules/runtime-war/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/NOTICE (renamed from branches/sca-java-1.2.1/modules/runtime-war/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/pom.xml (renamed from branches/sca-java-1.2.1/modules/runtime-war/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/runtime/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/LICENSE (renamed from branches/sca-java-1.2.1/modules/runtime/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/NOTICE (renamed from branches/sca-java-1.2.1/modules/runtime/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/pom.xml (renamed from branches/sca-java-1.2.1/modules/runtime/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java (renamed from branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/sca-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/sca-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/sca-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java (renamed from branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-admin/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-admin/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png)bin818 -> 818 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-xml/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-xml/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-xml/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory)0
2747 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
index 109b2f1acb..109b2f1acb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 98f247e5cc..98f247e5cc 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index 90a4292546..90a4292546 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
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
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
index f2215fcae5..f2215fcae5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
index 7d74806423..7d74806423 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 89279510d5..89279510d5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index c7ea897cbf..c7ea897cbf 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/pom.xml
index 0184c617fc..0184c617fc 100644
--- a/branches/sca-java-1.2.1/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 029b1326b9..029b1326b9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 514456f86a..514456f86a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 2798ab56f7..2798ab56f7 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index b0c24aef39..b0c24aef39 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index f3c0a07863..f3c0a07863 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 55540452af..55540452af 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 8a7dee1d8d..8a7dee1d8d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index f38346663a..f38346663a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index 5f5856d051..5f5856d051 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 6772045c06..6772045c06 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
index 265846e23f..265846e23f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index c1a4605f83..c1a4605f83 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index ef9d65b37c..ef9d65b37c 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index fee8e02f4e..fee8e02f4e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index f536b35140..f536b35140 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index ced482dbf6..ced482dbf6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index 2096bbd651..2096bbd651 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
index 07e26d0fc6..07e26d0fc6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
index ba4cec0fc9..ba4cec0fc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
index 86bd2a6449..86bd2a6449 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
index 6003b3f67d..6003b3f67d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index efd10bfe9a..efd10bfe9a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index b572b67ced..b572b67ced 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 1007286e40..1007286e40 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index a4599e96f6..a4599e96f6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 63a4def855..63a4def855 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 0b36aad9b7..0b36aad9b7 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index e2c4f82b9d..e2c4f82b9d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index ea7ecfc30b..ea7ecfc30b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 2368896a69..2368896a69 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 297a7c3a99..297a7c3a99 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index bee7cbec2d..bee7cbec2d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 767b152624..767b152624 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 40d5f4e63f..40d5f4e63f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
index f06b8e95ea..f06b8e95ea 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 854d15f546..854d15f546 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index c8694966fe..c8694966fe 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
index c0aec10604..c0aec10604 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 7356cd0d2a..7356cd0d2a 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index cc351442e7..cc351442e7 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index e414198f4d..e414198f4d 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index cd4e99d499..cd4e99d499 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 1e5a74954a..1e5a74954a 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index 9739fa22f4..9739fa22f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index 7561d3004e..7561d3004e 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index ac0c836646..ac0c836646 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index a294e0ecfa..a294e0ecfa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index 5e9331ae06..5e9331ae06 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 2173eabef9..2173eabef9 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index dcea5a9039..dcea5a9039 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index 24baaa51cd..24baaa51cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
index 633055442d..633055442d 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 807d6a8971..807d6a8971 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index aeec78aca3..aeec78aca3 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 52e0e916f5..52e0e916f5 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
index 5bc96426ad..5bc96426ad 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index f2ed343ea0..f2ed343ea0 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
index 281be750d1..281be750d1 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
index ab40ae40cb..ab40ae40cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
index c6697e1b46..c6697e1b46 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
index 6e78d2937b..6e78d2937b 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
index 8960ba8d96..8960ba8d96 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 1a9f91fab2..1a9f91fab2 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
index 7b98ad8abb..7b98ad8abb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index dfc8d2d00e..dfc8d2d00e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 90056b8343..90056b8343 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index 543bd51d60..543bd51d60 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index cff632eb3d..cff632eb3d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index 9e512e83af..9e512e83af 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index 092c8f87f4..092c8f87f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index e44233e1e9..e44233e1e9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 3af2833870..3af2833870 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 86b19ea3d9..86b19ea3d9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index b2861d4122..b2861d4122 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 9ba17691c3..9ba17691c3 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index 945427ced2..945427ced2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 89d6e1bf55..89d6e1bf55 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index 14a7e94e48..14a7e94e48 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index 95d0542e4f..95d0542e4f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index c05f9ad631..c05f9ad631 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 6a96b14d78..6a96b14d78 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e6f4032d06..e6f4032d06 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 1d99f157bb..1d99f157bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82e85ef067..82e85ef067 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a89f711da9..a89f711da9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
index a8100d280b..a8100d280b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
index 3c39a73586..3c39a73586 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
index 3d3f785a50..3d3f785a50 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
index 8b62f3c3d8..8b62f3c3d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index 70e2461b0e..70e2461b0e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 56c80f60eb..56c80f60eb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index a54c9bc41b..a54c9bc41b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 27d2a0be58..27d2a0be58 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 275ae31f90..275ae31f90 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
index 041b3f1334..041b3f1334 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
index 85ee25bf42..85ee25bf42 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
index 050ba9b73c..050ba9b73c 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
index a71205ea77..a71205ea77 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
index c95c8ac012..c95c8ac012 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
index 5feaae401c..5feaae401c 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
index 39a4213a65..39a4213a65 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
index 503f30e685..503f30e685 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
index a9a1167544..a9a1167544 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
index 0fb3b0211b..0fb3b0211b 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
index 4d8fb943f0..4d8fb943f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
index ced9d8e194..ced9d8e194 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
index 45b35d9206..45b35d9206 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
index 18bc73efde..18bc73efde 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
index 7adbfca6e8..7adbfca6e8 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
index e93ecd40ee..e93ecd40ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
index 5cc0a30d7b..5cc0a30d7b 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
index 85fd626871..85fd626871 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
index ec5ba85657..ec5ba85657 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
index a60b1f5b3f..a60b1f5b3f 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
index 6ef305f2fb..6ef305f2fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
index 5e91268349..5e91268349 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
index 49478e3db0..49478e3db0 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
index f69b024da9..f69b024da9 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3f073b28b9..3f073b28b9 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index f81a0d33ae..f81a0d33ae 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
index 4a33637121..4a33637121 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
index b7416011ba..b7416011ba 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
index 884e954036..884e954036 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
index ca4a5a1946..ca4a5a1946 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
index a9ddc1a2c8..a9ddc1a2c8 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-http/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-http/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/pom.xml
index aa2a7d70ef..aa2a7d70ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..6192b92dfe 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index 370e4cdb67..370e4cdb67 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 7e72b7dd85..7e72b7dd85 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index ced0d79887..ced0d79887 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index 421ecfcd1c..421ecfcd1c 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 900ac5156e..900ac5156e 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index 196394d7ef..196394d7ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
index 44da6b166c..44da6b166c 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc07784cb7..cc07784cb7 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 0fa8d44c08..0fa8d44c08 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index bc87dd2f93..bc87dd2f93 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 0e0360d821..0e0360d821 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index 1cfc02a473..1cfc02a473 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
index 62c4af4e22..62c4af4e22 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
index f3b9f5ae45..f3b9f5ae45 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index 39be2afd49..39be2afd49 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
index 3c5999015a..3c5999015a 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
index 60cd33d9bb..60cd33d9bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index f6a11412e5..f6a11412e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 2730567618..2730567618 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
index 9169d3f5c5..9169d3f5c5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index d66079886b..d66079886b 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index a51bf51a22..a51bf51a22 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index 686a6fa477..686a6fa477 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 1749d378b1..1749d378b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
index f37fe21709..f37fe21709 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 5b68b4900f..5b68b4900f 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac37a0f26b..ac37a0f26b 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index dec0991984..dec0991984 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index daa3d551df..daa3d551df 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
index 575ed669ca..575ed669ca 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
index 368c8a2239..368c8a2239 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
index b88341fc03..b88341fc03 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
index 28064e5de1..28064e5de1 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
index b237b77b28..b237b77b28 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 409acf99f7..409acf99f7 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
index a351aaa025..a351aaa025 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
index fea001bc8e..fea001bc8e 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
index 425f71caf9..425f71caf9 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index a9fff462fa..a9fff462fa 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index b551007413..b551007413 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e2528f59e5..e2528f59e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 839a190b83..839a190b83 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3adbec0f97..3adbec0f97 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
index 584228abde..584228abde 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
index e63cafd6a6..e63cafd6a6 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index f937e80cf5..f937e80cf5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
index 491b42c69c..491b42c69c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
index 030b3fdc58..030b3fdc58 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
index e320357d93..e320357d93 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
index f09798859b..f09798859b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
index 2749f5f958..2749f5f958 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
index 992cbb6c2d..992cbb6c2d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
index 2cefaa8bba..2cefaa8bba 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
index 0c9e1df1bc..0c9e1df1bc 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
index 7592f4f824..7592f4f824 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
index f088025a23..f088025a23 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
index b594fde29f..b594fde29f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
index 59ab37b2eb..59ab37b2eb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
index 7748fdffe9..7748fdffe9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
index 81f87dc4da..81f87dc4da 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
index 6e61f82042..6e61f82042 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
index a46ae13763..a46ae13763 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
index 8dc5be9b16..8dc5be9b16 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
index 015ccebaa9..015ccebaa9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
index 41610edc3b..41610edc3b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
index e80af5ea68..e80af5ea68 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
index 7df1c21ca9..7df1c21ca9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
index a4bee61947..a4bee61947 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
index aec7907441..aec7907441 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
index 68d9340abf..68d9340abf 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
index 04d7aca0e6..04d7aca0e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
index ea66e8f11b..ea66e8f11b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
index 9b7eb149e0..9b7eb149e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
index 1c3a0aaee8..1c3a0aaee8 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
index eb1a89812d..eb1a89812d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
index af20d02c00..af20d02c00 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
index 8dcf9fda58..8dcf9fda58 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
index c5c8a99e5c..c5c8a99e5c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
index e92ffc1d0c..e92ffc1d0c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
index c2c16ab5cd..c2c16ab5cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
index 68099b40bb..68099b40bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
index 9533ea3062..9533ea3062 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
index 159357ed90..159357ed90 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
index 76e4999ddc..76e4999ddc 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
index 54bda38033..54bda38033 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
index c0a324d663..c0a324d663 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
index 8318892e0f..8318892e0f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
index aaa9ddb7b5..aaa9ddb7b5 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
index 26b8fd0357..26b8fd0357 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
index b546f8c550..b546f8c550 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
index 1039a3df9d..1039a3df9d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
index 25eb336c05..25eb336c05 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
index 76f2e8ec81..76f2e8ec81 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
index fa73da9a19..fa73da9a19 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
index 8a05440319..8a05440319 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
index 39d53bca8d..39d53bca8d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
index 13d686b803..13d686b803 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
index f1f1a7737b..f1f1a7737b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
index aeafce46e0..aeafce46e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
index 5871d370fb..5871d370fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
index ba52687e16..ba52687e16 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
index 0aec2da465..0aec2da465 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
index 53f56b6626..53f56b6626 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
index 1684d0c3ee..1684d0c3ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
index f4702806e0..f4702806e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
index fcd0717688..fcd0717688 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
index db65ba7491..db65ba7491 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
index 72aa20af3d..72aa20af3d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
index 391820444f..391820444f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
index 2c0c846841..2c0c846841 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
index 8314d628ba..8314d628ba 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
index b89bfa2470..b89bfa2470 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
index 1abb187271..1abb187271 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
index f12a4582dd..f12a4582dd 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
index 75ee8aea6f..75ee8aea6f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
index 91bf371549..91bf371549 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
index 34dee40761..34dee40761 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
index 0f661717c0..0f661717c0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
index 6ffbd8724e..6ffbd8724e 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
index 0047f2b6cb..0047f2b6cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
index 56e6c361c3..56e6c361c3 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
index 40795987d0..40795987d0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
index 3f0ddc546c..3f0ddc546c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
index 68bc368a53..68bc368a53 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
index 057d686905..057d686905 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
index d87c9d4eb5..d87c9d4eb5 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
index 8f5d368e05..8f5d368e05 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
index a45c6807e6..a45c6807e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
index 046914e9db..046914e9db 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
index a7f26003b0..a7f26003b0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5e5ce97054..5e5ce97054 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
index a7e864cb55..a7e864cb55 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
index 4f51175407..4f51175407 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
index b65257e45b..b65257e45b 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index e9986e216c..e9986e216c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
index 066335fd57..066335fd57 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
index f60b0680e4..f60b0680e4 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
index 2853946560..2853946560 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
index 2c3be9539b..2c3be9539b 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 582f321be9..582f321be9 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
index acb81a00f6..acb81a00f6 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
index 73aedc3b6c..73aedc3b6c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
index f636c8f7d8..f636c8f7d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
index d5dc509f3e..d5dc509f3e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index e626293c6e..e626293c6e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
index f1730d8d6c..f1730d8d6c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index c2d3dc4085..c2d3dc4085 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index 2213b50b53..2213b50b53 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index fb83f9b420..fb83f9b420 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 8873c19800..8873c19800 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index ad1a4de4f6..ad1a4de4f6 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index 57c43aa800..57c43aa800 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index cc37512175..cc37512175 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 19370285f5..19370285f5 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index e71156c379..e71156c379 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index d45be65e20..d45be65e20 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index ae7b72834e..ae7b72834e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 43cd5e00b9..43cd5e00b9 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 5ffcb50eb8..5ffcb50eb8 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
index 9c09ed88f0..9c09ed88f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index 2b4989264c..2b4989264c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index ae9cca1638..ae9cca1638 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2d0597ff01..2d0597ff01 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
index bbe5f6aaa6..bbe5f6aaa6 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index b067fae901..b067fae901 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 6ced6de979..6ced6de979 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index fd9061b852..fd9061b852 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index d51f3caaec..d51f3caaec 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index 076648c78b..076648c78b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b369cde06..1b369cde06 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 95d08c9fcb..95d08c9fcb 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
index 9b99ecfa5e..9b99ecfa5e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index e61e8d2362..e61e8d2362 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
index 729250a21f..729250a21f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index ffa4f3f316..ffa4f3f316 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index 58d97c644f..58d97c644f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
index 3d337ed304..3d337ed304 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
index 8530f37f07..8530f37f07 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index cf1db53cff..cf1db53cff 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 55ec104a73..55ec104a73 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index ed1a2abad2..ed1a2abad2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index a63d773dbe..a63d773dbe 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 4990d9c15f..4990d9c15f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index fc3342750b..fc3342750b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index 70488ce22e..70488ce22e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 8fafe0b165..8fafe0b165 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index 6e3931e708..6e3931e708 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index fd1178af68..fd1178af68 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index aa911d63d6..aa911d63d6 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index d418d8db9a..d418d8db9a 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 028b03e56c..028b03e56c 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b78325d21c..b78325d21c 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 3da588a834..3da588a834 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index eecadac929..eecadac929 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index c9e2d122e0..c9e2d122e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index d5d7773353..d5d7773353 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index 9396dfd1f2..9396dfd1f2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index 67c240592d..67c240592d 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index 3c2f377ec8..3c2f377ec8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index fadb164636..fadb164636 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index 174292b8b8..174292b8b8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
index cf9a179bdd..cf9a179bdd 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index 0988f675e7..0988f675e7 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bc9f9b7d62..bc9f9b7d62 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index 552b993c2b..552b993c2b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 9e9d4913a2..9e9d4913a2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 9028662d05..9028662d05 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f02e7d6fc0..f02e7d6fc0 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
index 278da71d7b..278da71d7b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index 396de570e8..396de570e8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
index 17f6888813..17f6888813 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index 24325dd2bd..24325dd2bd 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
index 5c1cefb808..5c1cefb808 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
index 8662d92044..8662d92044 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
index c1011c5811..c1011c5811 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
index e69c96ba2e..e69c96ba2e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index ea758823a9..ea758823a9 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index 03d05f4c9f..03d05f4c9f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
index 52c0f64fe5..52c0f64fe5 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 22c9a64b05..22c9a64b05 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5c6b8e21fc..5c6b8e21fc 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index f3736cb229..f3736cb229 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
index ec72c777ef..ec72c777ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
index 1def910d94..1def910d94 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index bedee689d5..bedee689d5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index 83e2870bb8..83e2870bb8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index 9501c90ce2..9501c90ce2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 4e771171b0..4e771171b0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index 3cdaba8da1..3cdaba8da1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 3e599d38cd..3e599d38cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index 3b188b0176..3b188b0176 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index 20930666b1..20930666b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 45be9ef0d0..45be9ef0d0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index a90ebffe2e..a90ebffe2e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index ed2d862722..ed2d862722 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index c761c7481e..c761c7481e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 567d313d0a..567d313d0a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
index 05a4245a3c..05a4245a3c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
index f4bc6ab4a0..f4bc6ab4a0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 370b83f87b..370b83f87b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a48ff54c77..a48ff54c77 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index fdf34c5a80..fdf34c5a80 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index 5f2b66a75f..5f2b66a75f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
index 1641457d28..1641457d28 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
index af3c45aa93..af3c45aa93 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
index 2ce23bf2c4..2ce23bf2c4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
index d4d20414e5..d4d20414e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
index 767f59646f..767f59646f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
index e5e76af0b7..e5e76af0b7 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
index 2dc7d8dee4..2dc7d8dee4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
index e60c30790a..e60c30790a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
index 5e1a4cf259..5e1a4cf259 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
index d028ced69e..d028ced69e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
index c7b503af17..c7b503af17 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
index e2f3982d99..e2f3982d99 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
index 88705c1a95..88705c1a95 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
index f30286feea..f30286feea 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
index 7ee48d4451..7ee48d4451 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
index f09ca4a435..f09ca4a435 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
index f3a4ae4c8b..f3a4ae4c8b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
index d1cbfb88fd..d1cbfb88fd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
index 71d7bf68fb..71d7bf68fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
index e7511027c2..e7511027c2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
index 017d9bb478..017d9bb478 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
index a3a43d032f..a3a43d032f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 4ceee2d63e..4ceee2d63e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index 535ad3eeca..535ad3eeca 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
index 56d0537a44..56d0537a44 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
index 661afdddad..661afdddad 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
index 9b2e0eafa0..9b2e0eafa0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
index 98d9a73926..98d9a73926 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
index 201d11a79f..201d11a79f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
index f5d87cdcee..f5d87cdcee 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
index 03b3edf15b..03b3edf15b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
index cc32fa0f37..cc32fa0f37 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
index 37161d53ec..37161d53ec 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
index eeeee9cecd..eeeee9cecd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
index 635ca034e3..635ca034e3 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index 327000ac73..327000ac73 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
index 8986f68151..8986f68151 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
index 395cfe28d6..395cfe28d6 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
index 90a2a95abb..90a2a95abb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
index d463cad33f..d463cad33f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
index 536f4cacea..536f4cacea 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
index db5b88f9ac..db5b88f9ac 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
index 506270b437..506270b437 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
index 5c5950419b..5c5950419b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
index b78a21c366..b78a21c366 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
index 14e7f6b99d..14e7f6b99d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
index 42d11ac2f0..42d11ac2f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index fadeb714b4..fadeb714b4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
index a48296f76b..a48296f76b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
index b2ccd7f97d..b2ccd7f97d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 9b92f6862f..9b92f6862f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 32b042402b..32b042402b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index 34df9447b1..34df9447b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index b11c50b00c..b11c50b00c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index 394bf05506..394bf05506 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index c7081b9a72..c7081b9a72 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index 7d3e1d1327..7d3e1d1327 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index c2cd598508..c2cd598508 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 38a7c045be..38a7c045be 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
index 7bf47bc412..7bf47bc412 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index c1a516c2d8..c1a516c2d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
index c66fa51c34..c66fa51c34 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 24dc2de89d..24dc2de89d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
index 4c85637f0d..4c85637f0d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
index da5bab45e8..da5bab45e8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
index 13e002be1b..13e002be1b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
index 2f6fab0d07..2f6fab0d07 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 21896f3b32..21896f3b32 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
index b1902de916..b1902de916 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
index 12b2b18e55..12b2b18e55 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 75d0dc717c..75d0dc717c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
index b1902de916..b1902de916 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
index 2a22a0905d..2a22a0905d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
index e6f999aad7..e6f999aad7 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
index d9e889768b..d9e889768b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index c98b9cb815..c98b9cb815 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index 89e4892f62..89e4892f62 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index 6b8cca67cb..6b8cca67cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index 6cdb0c78f4..6cdb0c78f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
index 2c3aa0b978..2c3aa0b978 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
index e82e93d971..e82e93d971 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 82ed771473..82ed771473 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index ecc7f2d750..ecc7f2d750 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb982e8647..cb982e8647 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index cb6c790563..cb6c790563 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 19d377f915..19d377f915 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 896a901862..896a901862 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 959802af43..959802af43 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 37c80aa910..37c80aa910 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
index 5f5c7dcbd5..5f5c7dcbd5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 04f8ab0d3c..04f8ab0d3c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 23dc629bf6..23dc629bf6 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 8902dd04ee..8902dd04ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index 0a410fdcdf..0a410fdcdf 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
index aeeca5ef8d..aeeca5ef8d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
index dd71547fc3..dd71547fc3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
index d2bc77126d..d2bc77126d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
index 43ab6fc5a4..43ab6fc5a4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
index 21cf04271b..21cf04271b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f9dbee53bb..f9dbee53bb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/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/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 86434ac4bf..86434ac4bf 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/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/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
index b0c920cb72..b0c920cb72 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
index 9fa8dfb674..9fa8dfb674 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
index c172528538..c172528538 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
index 0d4c17a15b..0d4c17a15b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
index 184f23cc61..184f23cc61 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index 24aff4023e..24aff4023e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 3df275a7a1..3df275a7a1 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index f3006b0af5..f3006b0af5 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 19afc63c5a..19afc63c5a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 4ad070b2c3..4ad070b2c3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index cd5e87ca42..cd5e87ca42 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index 630d1f6bf4..630d1f6bf4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index b644709266..b644709266 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index c33b31b550..c33b31b550 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 9b3dce7029..9b3dce7029 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 64af372111..64af372111 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index 98852e951c..98852e951c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index 01083cc6a6..01083cc6a6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index 66ecd33da6..66ecd33da6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index f96771095b..f96771095b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index dfb600153e..dfb600153e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
index c50241ae0f..c50241ae0f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index ee94d889ad..ee94d889ad 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index 4946002b14..4946002b14 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index 873a21a456..873a21a456 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..f35f35ac4c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index 840c4e2f02..840c4e2f02 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index 3bf9e54774..3bf9e54774 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
index 95fba93181..95fba93181 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..cc18d5f798 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 484eddd222..484eddd222 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index 24612b0450..24612b0450 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index a293330a57..a293330a57 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac1fa9aade..ac1fa9aade 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/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/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/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/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 7debb3d3c6..7debb3d3c6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index c911899b08..c911899b08 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index c1ef86b68c..c1ef86b68c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 81c7ee525a..81c7ee525a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 7f342c2278..7f342c2278 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
index ba1f45a674..ba1f45a674 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
index a71fa61a54..a71fa61a54 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 8991585d32..8991585d32 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index bf5d636044..bf5d636044 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
index e4c3a722d3..e4c3a722d3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 6d2a31f702..6d2a31f702 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 9a4475ef23..9a4475ef23 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
index 095866fb6f..095866fb6f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 86f199368b..86f199368b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index cdf16a383f..cdf16a383f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 75219227c2..75219227c2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 9a05e43d7a..9a05e43d7a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
index c8261e6a4f..c8261e6a4f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 1e52a20d16..1e52a20d16 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
index cdbdddb31d..cdbdddb31d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index 5b1dd98579..5b1dd98579 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 07e80f66f3..07e80f66f3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 52c3cd3076..52c3cd3076 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
index 7a1a104b71..7a1a104b71 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
index 9f1fcfb606..9f1fcfb606 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index 632d135cb5..632d135cb5 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/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/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 02e8b411eb..02e8b411eb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/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/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 8dec190930..8dec190930 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
index 40d12e8544..40d12e8544 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
index 02f8e60376..02f8e60376 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
index e749b31ff6..e749b31ff6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
index 4119c344ce..4119c344ce 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
index cd5f97e62e..cd5f97e62e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
index c2d525dfef..c2d525dfef 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index 96e642ce20..96e642ce20 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
index 880f5f5786..880f5f5786 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
index fa3674d678..fa3674d678 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
index 0baa511b31..0baa511b31 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index 9e337b898e..9e337b898e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 14eb81546d..14eb81546d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/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/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 08d2b1c338..08d2b1c338 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/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/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
index d39a5065c2..d39a5065c2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index f4751db9aa..f4751db9aa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
index 42592e05c0..42592e05c0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
index 426721f0de..426721f0de 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
index 80310ac112..80310ac112 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
index 2587f9393a..2587f9393a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
index a6a6084f5f..a6a6084f5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
index ccba6b5a98..ccba6b5a98 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
index 7f5870ad55..7f5870ad55 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
index 83d0224ad4..83d0224ad4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
index 0eb7fb692b..0eb7fb692b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
index 38fa2721bb..38fa2721bb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
index 1495ff2cea..1495ff2cea 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
index 0b3dcf177e..0b3dcf177e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
index 885fe8cfb0..885fe8cfb0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
index 44673bfdb9..44673bfdb9 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
index d93a92b32c..d93a92b32c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
index 8743556538..8743556538 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
index f94238089f..f94238089f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
index 52d7e602b7..52d7e602b7 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
index 4f55148651..4f55148651 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
index 3dc86d97f7..3dc86d97f7 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
index a364c23174..a364c23174 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
index 7d8689f1f4..7d8689f1f4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index 58c2c1ba4e..58c2c1ba4e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index 51f898d802..51f898d802 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 5a7ab9d226..5a7ab9d226 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index ac98ace66e..ac98ace66e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-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/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 68030bf6e6..68030bf6e6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-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/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 59188ec3a3..59188ec3a3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
index 6af6167b6c..6af6167b6c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/pom.xml
index 6b7a69f952..6b7a69f952 100644
--- a/branches/sca-java-1.2.1/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 7400501d85..7400501d85 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 47197cb10c..47197cb10c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 6edf59c728..6edf59c728 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index 555d25a2db..555d25a2db 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index ffe190132c..ffe190132c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 35076f55a7..35076f55a7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 0ada4ebec3..0ada4ebec3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c0dd5431d7..c0dd5431d7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 881987f622..881987f622 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index fc5eb582f7..fc5eb582f7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index cf54267b5f..cf54267b5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index b5f536c431..b5f536c431 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index df8bb4b9e0..df8bb4b9e0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 3c67a8c550..3c67a8c550 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 426d7beb29..426d7beb29 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 95e5c238df..95e5c238df 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 61eda755bd..61eda755bd 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index e1f1a2d27f..e1f1a2d27f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index e1e3a7283d..e1e3a7283d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index 6cd3b8da45..6cd3b8da45 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index bcab45b8fe..bcab45b8fe 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 63a04a3642..63a04a3642 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index f17f31edb1..f17f31edb1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index ed99239b19..ed99239b19 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index fcf9347564..fcf9347564 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9700e2bc60..9700e2bc60 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 2ecddf5465..2ecddf5465 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 7714586951..7714586951 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 82df73388c..82df73388c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index cc3bb59a5b..cc3bb59a5b 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index b4c7236ef0..b4c7236ef0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index 2ef5b9eda7..2ef5b9eda7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index a001baa47f..a001baa47f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index e63269ee66..e63269ee66 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index a4e2f5f51c..a4e2f5f51c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 2831bebbc4..2831bebbc4 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index ba5413b0d1..ba5413b0d1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 4d49a13e0e..4d49a13e0e 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 24aae45b59..24aae45b59 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index e183206894..e183206894 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index 5158eaf85c..5158eaf85c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index ce2b4b13c3..ce2b4b13c3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index 33399dcc2f..33399dcc2f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index 838359be5f..838359be5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index ecb774ac0c..ecb774ac0c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 4bf29a3993..4bf29a3993 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index 05e3c6a86d..05e3c6a86d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 8bfdedf180..8bfdedf180 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index 7fc6210680..7fc6210680 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index 0b9aca70cf..0b9aca70cf 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index b0e02f06fa..b0e02f06fa 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index 5079db4904..5079db4904 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 0660d69897..0660d69897 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
index 33c847a049..33c847a049 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
index 797ab924a4..797ab924a4 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index bfaa69cc22..bfaa69cc22 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index 808fb42e3b..808fb42e3b 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index c138aba825..c138aba825 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 049a608592..049a608592 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index 2effaaa95a..2effaaa95a 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index d057207991..d057207991 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index e5965db2c5..e5965db2c5 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 31dca1dba5..31dca1dba5 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index fdd520f44a..fdd520f44a 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index eef42bbe8f..eef42bbe8f 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index ecae54188c..ecae54188c 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/pom.xml
index e808188844..e808188844 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 50958b7848..50958b7848 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index d9cc716f7a..d9cc716f7a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 56c712a65a..56c712a65a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 9609487080..9609487080 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 7a286069d5..7a286069d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 6a0c44a404..6a0c44a404 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index c116be921c..c116be921c 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index b0debc36c4..b0debc36c4 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index ca0f4889a5..ca0f4889a5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 247b5969c2..247b5969c2 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 6e23568088..6e23568088 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index c2a9c488b8..c2a9c488b8 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index e1b84e4f9f..e1b84e4f9f 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3626e16425..3626e16425 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 13d3376599..13d3376599 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index a9238cf6eb..a9238cf6eb 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 2f8dd70bc5..2f8dd70bc5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index a349b71d72..a349b71d72 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 87eb0069b4..87eb0069b4 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index da37385af1..da37385af1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 3cf82982dc..3cf82982dc 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 647eba33aa..647eba33aa 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 66bbae684d..66bbae684d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 3a563b9fb5..3a563b9fb5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index ad55ce386b..ad55ce386b 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index 5701a04ed1..5701a04ed1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index f4e97f71ec..f4e97f71ec 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index d1f4496337..d1f4496337 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/pom.xml
index fd33a7c331..fd33a7c331 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 94bd5c8cf2..94bd5c8cf2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 2c27a5c6d5..2c27a5c6d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index effd2b615c..effd2b615c 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index ba2d5045f2..ba2d5045f2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 9432f7b69e..9432f7b69e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 9587a2b0ae..9587a2b0ae 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index 6b19bac413..6b19bac413 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 39bb377aa8..39bb377aa8 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
index 17a7e9084c..17a7e9084c 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 492ab2732e..492ab2732e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 7ff12f3084..7ff12f3084 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 56e737e3ab..56e737e3ab 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index 27430b7f5d..27430b7f5d 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 6e81358b03..6e81358b03 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
index 04e4d6232e..04e4d6232e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/pom.xml
index 59de2b3b30..59de2b3b30 100644
--- a/branches/sca-java-1.2.1/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index 79a45bd9c3..79a45bd9c3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index 555eb43e4c..555eb43e4c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 455409e5e3..455409e5e3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index 31ddc78fce..31ddc78fce 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 399b0b20de..399b0b20de 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index d261258d64..d261258d64 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 8d4ee4d08e..8d4ee4d08e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index f0ad74df36..f0ad74df36 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 9321caf112..9321caf112 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index b5a9ef8682..b5a9ef8682 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 857a193260..857a193260 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index f303460cc5..f303460cc5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 4e3f352cc8..4e3f352cc8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 6969105661..6969105661 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index e2ad7d6001..e2ad7d6001 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 8e90c953e5..8e90c953e5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index d879182e14..d879182e14 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index cd14710880..cd14710880 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index a4cc49204e..a4cc49204e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4c3fd8b397..4c3fd8b397 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 67b922b99c..67b922b99c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 8b5c512cf2..8b5c512cf2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 974563b57c..974563b57c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index ec42b12e47..ec42b12e47 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 988bbfa877..988bbfa877 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 26be3cfa67..26be3cfa67 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index b219dd6bed..b219dd6bed 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 42049c83f2..42049c83f2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index edf447f6a3..edf447f6a3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index e17b120265..e17b120265 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 948ed7ad72..948ed7ad72 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 1faa33caed..1faa33caed 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index 196f64f091..196f64f091 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index dde20d2830..dde20d2830 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 5be91a052a..5be91a052a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index c1b0ea8fa2..c1b0ea8fa2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index c0646f577a..c0646f577a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index 1e4f663185..1e4f663185 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index fdd710c465..fdd710c465 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 474df16e83..474df16e83 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 7f419028f9..7f419028f9 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index fbc402bfe3..fbc402bfe3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 5bec2f655a..5bec2f655a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 43a3288ff2..43a3288ff2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index 6e51a8c9ec..6e51a8c9ec 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index 6fe883157f..6fe883157f 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index ea213f5311..ea213f5311 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 7da779bc21..7da779bc21 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 62ebeea1fb..62ebeea1fb 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 39a7c647f7..39a7c647f7 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index e3fdf483ad..e3fdf483ad 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index afd30efd92..afd30efd92 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
index 9e9100108f..9e9100108f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 0b3022bc7e..0b3022bc7e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index f120d66b0d..f120d66b0d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index af54f41104..af54f41104 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index dec1cc22ae..dec1cc22ae 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 4f72cbde50..4f72cbde50 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index 057274a204..057274a204 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index c119e55dc5..c119e55dc5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index f5c657e29d..f5c657e29d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 786e3e28d9..786e3e28d9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index baaa7425fc..baaa7425fc 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index f7ccb13e6e..f7ccb13e6e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 224c956fcb..224c956fcb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index f77658aec9..f77658aec9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 2e94116177..2e94116177 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f18f9638..a1f18f9638 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 661fb72905..661fb72905 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
index 1f52b7b03a..1f52b7b03a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index fe724e3302..fe724e3302 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 3c8f352cd8..3c8f352cd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index dde9a411eb..dde9a411eb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index cdb2f47d21..cdb2f47d21 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b323081364..b323081364 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index af192579e0..af192579e0 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index 18e97da2f0..18e97da2f0 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
index 1be9658e1c..1be9658e1c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
index 359d0fa20d..359d0fa20d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index d1a64a782c..d1a64a782c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index 12f44b479e..12f44b479e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index d34ee8b13c..d34ee8b13c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
index 8aaee84f80..8aaee84f80 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 4a240b3f55..4a240b3f55 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index a8b98fc214..a8b98fc214 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index c3e97a4818..c3e97a4818 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 05e420f1c6..05e420f1c6 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 61b3075539..61b3075539 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 79e8dc027f..79e8dc027f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index ef3112eb22..ef3112eb22 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 58d6123373..58d6123373 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e062e4c22..4e062e4c22 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
index b121e2c99f..b121e2c99f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
index 2efbfe3962..2efbfe3962 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
index 512e1c625f..512e1c625f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 563d6232b1..563d6232b1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
index 49fb38b1fa..49fb38b1fa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
index 2fc561b577..2fc561b577 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
index 928acb9f3c..928acb9f3c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
index 9758292aea..9758292aea 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
index 51c057162e..51c057162e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index 51b84ef648..51b84ef648 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 340205a9e2..340205a9e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index 5cc32e4172..5cc32e4172 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index ec7ecb4dda..ec7ecb4dda 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index 2fff9cc7cd..2fff9cc7cd 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index e6b082dc81..e6b082dc81 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index 393cb3baad..393cb3baad 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 8a5e0385ec..8a5e0385ec 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index 22ada81565..22ada81565 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 50086550a3..50086550a3 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index b0baaeb398..b0baaeb398 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4ce2f2342a..4ce2f2342a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 820025933f..820025933f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index 07af72f8b5..07af72f8b5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
index d4137b4a05..d4137b4a05 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 40deb05a6d..40deb05a6d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index 97ab0fe4eb..97ab0fe4eb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index 2b123b4db7..2b123b4db7 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1808b8d926..1808b8d926 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 1a160512bf..1a160512bf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index bebd706d49..bebd706d49 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index 9d1e85bcc1..9d1e85bcc1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index b27da5373a..b27da5373a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 93cd537a42..93cd537a42 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index b9b4b513c1..b9b4b513c1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index b14ca57589..b14ca57589 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index d895237c7d..d895237c7d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 671d07afd8..671d07afd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
index 93f5e7cdb2..93f5e7cdb2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 8695d096c2..8695d096c2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index ef6b5b0bf2..ef6b5b0bf2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index 16a6607052..16a6607052 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index 1f3384efd8..1f3384efd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index d3a1c3f656..d3a1c3f656 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f5182f465c..f5182f465c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index e141e27098..e141e27098 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
index 19bafdcba1..19bafdcba1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 77b879809a..77b879809a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 4d4daa0905..4d4daa0905 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 5ea4a0cb61..5ea4a0cb61 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index d549c91cbf..d549c91cbf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index dc8a822064..dc8a822064 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index ea851860e5..ea851860e5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index d6e4edf28e..d6e4edf28e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index f2b01a7e4e..f2b01a7e4e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index d97f201b15..d97f201b15 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 9ffa86578b..9ffa86578b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index dcd9242f30..dcd9242f30 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index cdd8d4e131..cdd8d4e131 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index 27f440c5c2..27f440c5c2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 831f565a1b..831f565a1b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffe8b895b8..ffe8b895b8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afd00b552c..afd00b552c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index c5d87d2c3c..c5d87d2c3c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 5fa9e81e76..5fa9e81e76 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 3665434cee..3665434cee 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 846ceaf377..846ceaf377 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 405053960b..405053960b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index a41dc585d9..a41dc585d9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index f5c26bf9f5..f5c26bf9f5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 799e0c2388..799e0c2388 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 78bc62eb3a..78bc62eb3a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
index bd9c34d87c..bd9c34d87c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index 4130dcb4df..4130dcb4df 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index eaf4fb4902..eaf4fb4902 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index a4f32c5cb1..a4f32c5cb1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index 800fae9780..800fae9780 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index 4fd961c52e..4fd961c52e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 907d06559a..907d06559a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 3b62a99021..3b62a99021 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
index b2cc6d67e2..b2cc6d67e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
index 830cb8108d..830cb8108d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
index df7df3d2b1..df7df3d2b1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
index 548d0b8df1..548d0b8df1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
index e606507a9f..e606507a9f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
index 2de353312a..2de353312a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
index 1e3ab7a188..1e3ab7a188 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
index a284b5b0af..a284b5b0af 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
index ebd282fd40..ebd282fd40 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
index a371c09c25..a371c09c25 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index f501ef2dc6..f501ef2dc6 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a733ad7b7d..a733ad7b7d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
index 1699538d62..1699538d62 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
index aac7ded180..aac7ded180 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
index 65da5b602a..65da5b602a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/branches/sca-java-1.2.1/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/pom.xml
index 90e5faae61..90e5faae61 100644
--- a/branches/sca-java-1.2.1/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index b8089dc529..b8089dc529 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 205843e2be..205843e2be 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 69a0e4510a..69a0e4510a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 4486117d31..4486117d31 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 4eceba71fa..4eceba71fa 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 05e7af946b..05e7af946b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 168a1052b3..168a1052b3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index feed87e45f..feed87e45f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 80e5e4f0a3..80e5e4f0a3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 70ea431d57..70ea431d57 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 27818dc24f..27818dc24f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 8d2b36482d..8d2b36482d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 062f087a15..062f087a15 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index aa3db5364c..aa3db5364c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index 379a967c9c..379a967c9c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index d3d3c6336f..d3d3c6336f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 87b4a79450..87b4a79450 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 0efb7e41b5..0efb7e41b5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
index ac711ca7a7..ac711ca7a7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
index f020abdeb0..f020abdeb0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 14d5c1763d..14d5c1763d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 50cedc64c6..50cedc64c6 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index d1dd6f28f0..d1dd6f28f0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 2bb39d9582..2bb39d9582 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 50b5bf6e8d..50b5bf6e8d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 56eabc8904..56eabc8904 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index e2db8c5834..e2db8c5834 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index 5d7776fa78..5d7776fa78 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index c36ebb04c5..c36ebb04c5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a6c0639411..a6c0639411 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
index 74d92135d8..74d92135d8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 310d1e6c00..310d1e6c00 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 4517d7eeb2..4517d7eeb2 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index a38a602544..a38a602544 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 845d88fc06..845d88fc06 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 5e18fddfc8..5e18fddfc8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 46ac413c9f..46ac413c9f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 60bffb5709..60bffb5709 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 1b1c2f17d3..1b1c2f17d3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 47c178abff..47c178abff 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 48a3b593fd..48a3b593fd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index 8331fa425a..8331fa425a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 63b8faddb4..63b8faddb4 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 18d7235be8..18d7235be8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 849912dc80..849912dc80 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 40d5c07499..40d5c07499 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 2a6094a76a..2a6094a76a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index d842048d81..d842048d81 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index 2ec864fbbd..2ec864fbbd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 06b2521d47..06b2521d47 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 157a95025d..157a95025d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index 71af7519e7..71af7519e7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 3e20e0be70..3e20e0be70 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index f20cd4f901..f20cd4f901 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index b07e6eb955..b07e6eb955 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 2b26c11d50..2b26c11d50 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 6b0afde322..6b0afde322 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index aa96877c02..aa96877c02 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index bf8edc47f9..bf8edc47f9 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 6cdbc82d9d..6cdbc82d9d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 35c20c28c0..35c20c28c0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index 486f1f256a..486f1f256a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index c1a06e335c..c1a06e335c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index b502b5003f..b502b5003f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index a76cd21f1d..a76cd21f1d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f5fd229ae5..f5fd229ae5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 902fddc234..902fddc234 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 776bae535c..776bae535c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 6dc78eefdb..6dc78eefdb 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index b08a374df8..b08a374df8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 3ec97a9049..3ec97a9049 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index e2bebd0eb0..e2bebd0eb0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index 372d57a567..372d57a567 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index 68b442bb3e..68b442bb3e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index 909e8ad57d..909e8ad57d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 8d12b2574e..8d12b2574e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index fd1cab54b3..fd1cab54b3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 4e07043b3d..4e07043b3d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 21307909a7..21307909a7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 283aa573d2..283aa573d2 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 8d4c22e742..8d4c22e742 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f235d77b5b..f235d77b5b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 1dd6c7fc0b..1dd6c7fc0b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index d53cf4ca55..d53cf4ca55 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index d210ad1371..d210ad1371 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index 174202842a..174202842a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 4e321f2055..4e321f2055 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index aae7bf33b7..aae7bf33b7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 31eed42c06..31eed42c06 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index 1aa90cce1b..1aa90cce1b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 1dc91374ea..1dc91374ea 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 7f640223b7..7f640223b7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index eddab9294f..eddab9294f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 227f3ac909..227f3ac909 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index 4c3d4e3327..4c3d4e3327 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index a39eef93e4..a39eef93e4 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index b7184cef9c..b7184cef9c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 350b546a15..350b546a15 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 3627b2d094..3627b2d094 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 21d584e16c..21d584e16c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 0deb06f577..0deb06f577 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index b5758d2149..b5758d2149 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index c4e461d68f..c4e461d68f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
index 5fe1cf3eeb..5fe1cf3eeb 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
index 049b3d60ef..049b3d60ef 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
index 7cb9087bd5..7cb9087bd5 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
index 02fc114e24..02fc114e24 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6ed79d85b4..6ed79d85b4 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
index 467cc6cbe9..467cc6cbe9 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
index 700d3d9d12..700d3d9d12 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index 7fb3810618..7fb3810618 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index 3728e8f2b4..3728e8f2b4 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/definitions/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/definitions/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/definitions/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/definitions/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/pom.xml
index eef42c639b..eef42c639b 100644
--- a/branches/sca-java-1.2.1/modules/definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
index c1b8b03a19..c1b8b03a19 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
index 0fad38b554..0fad38b554 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
index aeef85b45a..aeef85b45a 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
index 42f6acb3e2..42f6acb3e2 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
index f53cf8cd3b..f53cf8cd3b 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
index dbf463f2b0..dbf463f2b0 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
index 2e6b9ed137..2e6b9ed137 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
index c36411e4bd..c36411e4bd 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
index f46883d888..f46883d888 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
index 66a9803fae..66a9803fae 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
index 3d2a990593..3d2a990593 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/pom.xml
index 82846bbf00..82846bbf00 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
index 1a62801b1b..1a62801b1b 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
index e88a18a534..e88a18a534 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
index 860ab0171b..860ab0171b 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
index ad02e27c39..ad02e27c39 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
index 32497f8691..32497f8691 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
index 23483bede2..23483bede2 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
index e5f2152b3a..e5f2152b3a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
index 680ba1b80a..680ba1b80a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
index dadf05a49b..dadf05a49b 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
index 0ce961ae27..0ce961ae27 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
index 4abbbd9466..4abbbd9466 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
index 558439db99..558439db99 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
index b4e1ff5972..b4e1ff5972 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
index 12a140292d..12a140292d 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
index 513df3e9db..513df3e9db 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
index 443e4b8b71..443e4b8b71 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
index 378495d259..378495d259 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
index 0fde18ac97..0fde18ac97 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
index e99c31a3ee..e99c31a3ee 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
index 29fe2815d9..29fe2815d9 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
index e88c4f882a..e88c4f882a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
index 4320a52b4c..4320a52b4c 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
index fa01e64272..fa01e64272 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
index d4cfb5e1d9..d4cfb5e1d9 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
index 985a788a02..985a788a02 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
index 86e3a84c6a..86e3a84c6a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/domain/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/domain/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/pom.xml
index f855d83969..f855d83969 100644
--- a/branches/sca-java-1.2.1/modules/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
index 82d7d78b67..82d7d78b67 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
index fd50ba348a..fd50ba348a 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
index c637b54189..c637b54189 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
index 5db991edd1..5db991edd1 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
index b8c756b89f..b8c756b89f 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
index 0590cb6c30..0590cb6c30 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
index c0ae892329..c0ae892329 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
index c908515aaf..c908515aaf 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
index 5a634da69f..5a634da69f 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
index dc3b031483..dc3b031483 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
index 3befc322b4..3befc322b4 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
index c6dd269f8b..c6dd269f8b 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
index ad18bc9e40..ad18bc9e40 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
index cc097f835c..cc097f835c 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
diff --git a/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/pom.xml
index 08c2c51e4f..08c2c51e4f 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index cb8f6ac18d..cb8f6ac18d 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index e74eb0a7e3..e74eb0a7e3 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
index aacd0cb0a7..aacd0cb0a7 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
index 2eeccd7e4a..2eeccd7e4a 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
index 75494cd02c..75494cd02c 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
index 3b508b8ffd..3b508b8ffd 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
index 1c98c41fb4..1c98c41fb4 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
index 4fadd5895a..4fadd5895a 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
index 78eacc41f1..78eacc41f1 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
index 8944feba3d..8944feba3d 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
index 04b40a6133..04b40a6133 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
index 86fb752f10..86fb752f10 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
index 7baffacc32..7baffacc32 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
index 0169dbe9ec..0169dbe9ec 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
index a23f3a2ec0..a23f3a2ec0 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
index 7369e81c66..7369e81c66 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
index 11bfa7fc0d..11bfa7fc0d 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
index 37132e3f95..37132e3f95 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
index d68e2dcb6b..d68e2dcb6b 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
index 010a647ee7..010a647ee7 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
index 8f032c68f5..8f032c68f5 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
index 683786c97e..683786c97e 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a408b0d061..a408b0d061 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
index fad8e53271..fad8e53271 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index c1d80be772..c1d80be772 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 9ee7c274fd..9ee7c274fd 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index c74d0aad87..c74d0aad87 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index 8a512de5f8..8a512de5f8 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 40f2069379..40f2069379 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 8827a92387..8827a92387 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index e6ced00e1d..e6ced00e1d 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 60fc6dae2b..60fc6dae2b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index ab6f4680e6..ab6f4680e6 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 452f1a1ab1..452f1a1ab1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index 57b6a6d746..57b6a6d746 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 9252b114a1..9252b114a1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index c52c16d8e1..c52c16d8e1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 087a75426b..087a75426b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 2a59635a19..2a59635a19 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 9b099cd419..9b099cd419 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
index 86e0cb6a8a..86e0cb6a8a 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index 46fcdaf5e1..46fcdaf5e1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
index 9200d850bb..9200d850bb 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
index 4adec91151..4adec91151 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
index 78f9654f1b..78f9654f1b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
index 9388bc48cf..9388bc48cf 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
index 35554f907a..35554f907a 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
index 20957a352e..20957a352e 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
index 352cf192df..352cf192df 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
index d49179dec0..d49179dec0 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
index bd7c5fab79..bd7c5fab79 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/pom.xml
index 76313c20c6..76313c20c6 100644
--- a/branches/sca-java-1.2.1/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index ec530c7fa4..ec530c7fa4 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 8f20287f84..8f20287f84 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index e53b5fd6de..e53b5fd6de 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index 4f51198d27..4f51198d27 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index f887151a77..f887151a77 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index b061f171b9..b061f171b9 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
index 44f4550b40..44f4550b40 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
index de75fce346..de75fce346 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index 448318307a..448318307a 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index 3864102e9f..3864102e9f 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
index 11b8a269ab..11b8a269ab 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..f61708de90 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index e22559cc9c..e22559cc9c 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
index e90b45d7e9..e90b45d7e9 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8bab603184..8bab603184 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
index 0aa073d0ed..0aa073d0ed 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index d7ea6ae796..d7ea6ae796 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 3ac086a2ee..3ac086a2ee 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 32fe6c2deb..32fe6c2deb 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index dcda47f51d..dcda47f51d 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 8f1c4a253f..8f1c4a253f 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 60804c1003..60804c1003 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index f2c74711e0..f2c74711e0 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
index 014c5391b8..014c5391b8 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index f08e6c7063..f08e6c7063 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
index 99b3fa9090..99b3fa9090 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index b1dd818371..b1dd818371 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 29b3da5880..29b3da5880 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index eb9f4fd1e0..eb9f4fd1e0 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 9309e89d60..9309e89d60 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index 14bc5cb385..14bc5cb385 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
index f4c4c2b37a..f4c4c2b37a 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index 3ef8cff2d8..3ef8cff2d8 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index a670834307..a670834307 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
index 9d97d35281..9d97d35281 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
index e6300c81b9..e6300c81b9 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
index 7de0d48db5..7de0d48db5 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index d08545f20c..d08545f20c 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
index c2d8826ffc..c2d8826ffc 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index 7750c31967..7750c31967 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
index 09b11145d6..09b11145d6 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
index e859e4fe42..e859e4fe42 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 6845d2b94a..6845d2b94a 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
index be35733220..be35733220 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d99fdf257e..d99fdf257e 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
index 87b695c07a..87b695c07a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index c47888de17..c47888de17 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index 494498804d..494498804d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index 3ff9e5fb06..3ff9e5fb06 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
index d574f6e422..d574f6e422 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
index a40d91b9bc..a40d91b9bc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index 3442d86c4e..3442d86c4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
index e1144186be..e1144186be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 98405c3489..98405c3489 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
index b54b8b01c4..b54b8b01c4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
index c16201b147..c16201b147 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index 661f79f78d..661f79f78d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index ad6e0cf3b7..ad6e0cf3b7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 96083614ff..96083614ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index 2677f38c88..2677f38c88 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index d8f54e479a..d8f54e479a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
index 654b33ba2e..654b33ba2e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
index 01b3cd772d..01b3cd772d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
index b4189da2ca..b4189da2ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4763c69768..4763c69768 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 066fdc864b..066fdc864b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 53ffd1b72a..53ffd1b72a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b6481b1512..b6481b1512 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index 6aba1f27d9..6aba1f27d9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index b52a75012f..b52a75012f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
index 29f5cb74fc..29f5cb74fc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
index 6c7c7e7ab1..6c7c7e7ab1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
index 6091847b1e..6091847b1e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
index 98204a8324..98204a8324 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
index bf2bbc1812..bf2bbc1812 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
index d0b9d942c1..d0b9d942c1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
index d441437791..d441437791 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
index b849aa2405..b849aa2405 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
index 11d51dcd06..11d51dcd06 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
index 6df6e77dea..6df6e77dea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index 3c8822db1b..3c8822db1b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ae6db609a2..ae6db609a2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
index 8bf4e89ca8..8bf4e89ca8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
index f124c9883c..f124c9883c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
index 0c1368c4dd..0c1368c4dd 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
index 8e20abe34a..8e20abe34a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
index 5e031c6c38..5e031c6c38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
index bf9e13069b..bf9e13069b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
index 050d0cf17a..050d0cf17a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
index 87c29aa5b4..87c29aa5b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
index 58b537dbc8..58b537dbc8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
index fb828707a6..fb828707a6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ac4ebe87fb..ac4ebe87fb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
index 82576859c0..82576859c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index a93710d266..a93710d266 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index db5d346a68..db5d346a68 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index 0f86dc6ae8..0f86dc6ae8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 04ba42ed88..04ba42ed88 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 8193bed8b1..8193bed8b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 6f8d07bf84..6f8d07bf84 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index 8117549092..8117549092 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index ad2295fbda..ad2295fbda 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 423abab416..423abab416 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index d2df124958..d2df124958 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index fd0fc94770..fd0fc94770 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 23d42c5616..23d42c5616 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ebf8a707b0..ebf8a707b0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index f0bf0b738d..f0bf0b738d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index 339ab2743e..339ab2743e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index cc3f317f9e..cc3f317f9e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 9ba4db063e..9ba4db063e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index 628a308c86..628a308c86 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 8a7040a616..8a7040a616 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index a00b9e7109..a00b9e7109 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 08feb59c7a..08feb59c7a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
index 0e000dc832..0e000dc832 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 0e14a2a689..0e14a2a689 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 296debaae0..296debaae0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 7b408c553a..7b408c553a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index a19c7def04..a19c7def04 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 0f4903720f..0f4903720f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index a58fa0c072..a58fa0c072 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 5142737b32..5142737b32 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index e49359f3ee..e49359f3ee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
index 4e56280888..4e56280888 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 7b849f9b47..7b849f9b47 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 1b6414167c..1b6414167c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 889d14164e..889d14164e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 30f7e43fa6..30f7e43fa6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index daabec499f..daabec499f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index a6c3c16966..a6c3c16966 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index a2e01316a8..a2e01316a8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 3dc79a0da5..3dc79a0da5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 9596fe0808..9596fe0808 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..4a3ce0c343 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index bc6551d45d..bc6551d45d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..556f0b77e9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index e05df90343..e05df90343 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..177ceaa57c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index d14c346480..d14c346480 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 89e32eb34d..89e32eb34d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 5f59a82401..5f59a82401 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..5619275b82 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 0993d84a4d..0993d84a4d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 05df03471c..05df03471c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 9141151e28..9141151e28 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 29488eb3fe..29488eb3fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 1da8d15d04..1da8d15d04 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..cf1b4a9830 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index a1f8a766ae..a1f8a766ae 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index e15f9a0d6a..e15f9a0d6a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..a3d3889d30 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index b82e0df117..b82e0df117 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index fe93424d28..fe93424d28 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 5beb31f0f9..5beb31f0f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..fa1527fbe5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..365fb12afe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index ac3259f37f..ac3259f37f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 4555736813..4555736813 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 657ad757e5..657ad757e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..c7f340bd46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index e98a8fec1f..e98a8fec1f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index 58a18f9c7c..58a18f9c7c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 5381e0e175..5381e0e175 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index be2b5aa56e..be2b5aa56e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index 388a1aae8b..388a1aae8b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 632df7d48f..632df7d48f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 8d5e816a08..8d5e816a08 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..d68b1530f0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 7bb8e15696..7bb8e15696 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..d7de4e522e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 23c9fd263b..23c9fd263b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index da3d5083e2..da3d5083e2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
index 0ed5edf419..0ed5edf419 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index edf2aefdde..edf2aefdde 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 2e94f72c91..2e94f72c91 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index bfa2af61b1..bfa2af61b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
index f22cea193e..f22cea193e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
index 05d82e4dfc..05d82e4dfc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
index 5895a8614d..5895a8614d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
index 6cdb18938e..6cdb18938e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
index e2a3e4df92..e2a3e4df92 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index 2be25533d2..2be25533d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index 6488f89c6c..6488f89c6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 306b53be5b..306b53be5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
index a019fedd6d..a019fedd6d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index c25e952b69..c25e952b69 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index 201868ffb4..201868ffb4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
index 3e0f23c809..3e0f23c809 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index a15fec60d2..a15fec60d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index 8db2ee6ea8..8db2ee6ea8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9378db0875..9378db0875 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index 9dc0670f6c..9dc0670f6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index b3209991d0..b3209991d0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index 92787d3ac1..92787d3ac1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
index cbb0174bbb..cbb0174bbb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d2283fc30a..d2283fc30a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index fe23c40a3d..fe23c40a3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index f79d6f9502..f79d6f9502 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index c4644d0fee..c4644d0fee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
index b8a63a3b16..b8a63a3b16 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
index 37aec78258..37aec78258 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
index 22d567b5ac..22d567b5ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
index 96d33143c8..96d33143c8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
index e804d14d23..e804d14d23 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
index 0cca36855e..0cca36855e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
index c8540ae7c1..c8540ae7c1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
index e2f2496091..e2f2496091 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
index acb77eadd7..acb77eadd7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
index b439492bde..b439492bde 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
index 818cd923c0..818cd923c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f8f6975395..f8f6975395 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
index 561499a43b..561499a43b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
index f5fe1854f7..f5fe1854f7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
index 1fd952a0a8..1fd952a0a8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
index 75f4d964b5..75f4d964b5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
index e8602918f9..e8602918f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
index b118cc7677..b118cc7677 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
index cff2c86478..cff2c86478 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index af09013b6e..af09013b6e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
index c46ea0a465..c46ea0a465 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
index 329364ae58..329364ae58 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
index b6addced6f..b6addced6f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
index 6ed60a3591..6ed60a3591 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
index a2637ef48b..a2637ef48b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
index 21a6a8159f..21a6a8159f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 43ba8562f8..43ba8562f8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f2b028e87..0f2b028e87 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 0f0fa03f75..0f0fa03f75 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
index aecab00a9e..aecab00a9e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
index 335083429d..335083429d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index e8d89fe02b..e8d89fe02b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index 3e120f3767..3e120f3767 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index 7a6181206f..7a6181206f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index 9cd6119f73..9cd6119f73 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 58d6fb363e..58d6fb363e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index 971ae85d45..971ae85d45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 0b31145407..0b31145407 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5465eec8d9..5465eec8d9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
index 9d597c7d64..9d597c7d64 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index 194edfdbc4..194edfdbc4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index f1f685aa1d..f1f685aa1d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index d4db8772e4..d4db8772e4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index 9cad0890a3..9cad0890a3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index a32bb22645..a32bb22645 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
index 70b13e2629..70b13e2629 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index d76626b26c..d76626b26c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index 47e70b5581..47e70b5581 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b5774c5c5b..b5774c5c5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
index f77f723c3e..f77f723c3e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index 03f10e78e8..03f10e78e8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
index 5782e5ee9b..5782e5ee9b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
index 7aec0e3059..7aec0e3059 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 837e24c1d0..837e24c1d0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
index 4ceb847a7a..4ceb847a7a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
index 55b215fedf..55b215fedf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
index 9ac0e2c4fe..9ac0e2c4fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index ebbe14abd8..ebbe14abd8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
index c8152b606f..c8152b606f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index e3f81dd19b..e3f81dd19b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
index fd742f4279..fd742f4279 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
index df9e7a5c46..df9e7a5c46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
index 709114ebad..709114ebad 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
index ab76b9ca3d..ab76b9ca3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index dedc8bce09..dedc8bce09 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 39161a447b..39161a447b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index e86119b72e..e86119b72e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 9485f39faa..9485f39faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index 56015b5f7c..56015b5f7c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
index e8a6cd9819..e8a6cd9819 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 2ccbd4d4b4..2ccbd4d4b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index 79c204c759..79c204c759 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index 8d9e7b119f..8d9e7b119f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index 996978e196..996978e196 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 73fcd77b44..73fcd77b44 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index bd18153be8..bd18153be8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 8220fcade8..8220fcade8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index abd3ff311d..abd3ff311d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index c2f1ce811d..c2f1ce811d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 3f72c6cf45..3f72c6cf45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index 454843ea6c..454843ea6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 3c8b77e39f..3c8b77e39f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 9caf7a715f..9caf7a715f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 26c970a56b..26c970a56b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
index 77ba095988..77ba095988 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
index 4e71a4a3e6..4e71a4a3e6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
index beee72314d..beee72314d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
index 69a2f2e639..69a2f2e639 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index ce377e4ed3..ce377e4ed3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 4d32ed9f6b..4d32ed9f6b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
index 7ddf517b96..7ddf517b96 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 13cb94d511..13cb94d511 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index c641b82cd6..c641b82cd6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index 2f55995fd9..2f55995fd9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 26574c6266..26574c6266 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index a3551cefc3..a3551cefc3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index f72c6e922f..f72c6e922f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index bd754c8d2e..bd754c8d2e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index f4cfffe75e..f4cfffe75e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 175bb79104..175bb79104 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 7581b633cc..7581b633cc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index 91085b9eb2..91085b9eb2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 535164aae7..535164aae7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 8cf63390b1..8cf63390b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
index be89d80dca..be89d80dca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
index b550fc3229..b550fc3229 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
index 2d298b1dd8..2d298b1dd8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
index d1be4b4c18..d1be4b4c18 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
index 45f00ce1af..45f00ce1af 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
index dc532ce20d..dc532ce20d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
index 1dd44cd752..1dd44cd752 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
index 9dadcd2f49..9dadcd2f49 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index fe855e0c21..fe855e0c21 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 56af997fae..56af997fae 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index 33f3793920..33f3793920 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
index d7724f1723..d7724f1723 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
index ff6070fd19..ff6070fd19 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
index 45c26f5f42..45c26f5f42 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
index bfbdb04f5b..bfbdb04f5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
index 5d677b6c26..5d677b6c26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
index 3f98180498..3f98180498 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index b39c5d674e..b39c5d674e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index ae191d6b45..ae191d6b45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index ceee459e3e..ceee459e3e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index b3f0b8bbf9..b3f0b8bbf9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index 9e55f30b46..9e55f30b46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 85b29e5684..85b29e5684 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index 346299c580..346299c580 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b71cef6c4..4b71cef6c4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ab707cfd68..ab707cfd68 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index db4158521d..db4158521d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index b701b49c4e..b701b49c4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index 6640b990ca..6640b990ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index 5d5344cd13..5d5344cd13 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index 0b7d2525cf..0b7d2525cf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 249067ab2d..249067ab2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index 43bb685e32..43bb685e32 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 94f7e83f30..94f7e83f30 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 9603b50704..9603b50704 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 83a6898502..83a6898502 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 4aaac6fa6a..4aaac6fa6a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 1a93b1a8f9..1a93b1a8f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 76926c44c9..76926c44c9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index 1d91dc341e..1d91dc341e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f3e45d766f..f3e45d766f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index 3fd7e72be4..3fd7e72be4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index 48a5971711..48a5971711 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0ad7b01e9d..0ad7b01e9d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 0733f49de8..0733f49de8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index c7feddf87f..c7feddf87f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index d59205e066..d59205e066 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index f366c6819f..f366c6819f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
index a181446ffb..a181446ffb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
index aef5a5524b..aef5a5524b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
index fb9fb03692..fb9fb03692 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index b811122b41..b811122b41 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
index 477ca69a38..477ca69a38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
index ad02e27c39..ad02e27c39 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
index 4a618a19ca..4a618a19ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index 204ac24caf..204ac24caf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index 7bb852ae0c..7bb852ae0c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index 2493b97f5c..2493b97f5c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index 2b946ff3ec..2b946ff3ec 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index 5c442c1b37..5c442c1b37 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index 35a0325e3f..35a0325e3f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 49cf0eb3d2..49cf0eb3d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index 0b081fc77b..0b081fc77b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
index 75cb5ac3c7..75cb5ac3c7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6c167a6b31..6c167a6b31 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
index fc45baa16d..fc45baa16d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
index ef533d3fe9..ef533d3fe9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index a5b80ab16d..a5b80ab16d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
index 5b9cae88ac..5b9cae88ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
index 539e7b0f26..539e7b0f26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
index 8ff421632a..8ff421632a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
index c2277772bf..c2277772bf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
index 4fddcc4297..4fddcc4297 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
index f310fce586..f310fce586 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
index e5c032678d..e5c032678d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
index 6488e15b02..6488e15b02 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
index 402309aa2c..402309aa2c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
index a05cfae29b..a05cfae29b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
index f0f3eb000d..f0f3eb000d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 5e77575c3c..5e77575c3c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
index 8f3fefe806..8f3fefe806 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
index 9f1c48847c..9f1c48847c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
index ed64321bec..ed64321bec 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a51995e56d..a51995e56d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 7ccc08d1ee..7ccc08d1ee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
index 40f3f0e13e..40f3f0e13e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index ab4ce1587e..ab4ce1587e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index d75f8b2fde..d75f8b2fde 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 324fd34534..324fd34534 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index 66f2322950..66f2322950 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7e2d7f64a4..7e2d7f64a4 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 0520031f5a..0520031f5a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 9b205c72e6..9b205c72e6 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 87f75cca39..87f75cca39 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
index 6dc88dadc3..6dc88dadc3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 852f3dc3b5..852f3dc3b5 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index fff3dcf83a..fff3dcf83a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b3e52e5709..b3e52e5709 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 3cb605a388..3cb605a388 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 1624765b1d..1624765b1d 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/pom.xml
index 07ee3b10cb..07ee3b10cb 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index d0c5b66fdb..d0c5b66fdb 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 8a0292290a..8a0292290a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index 2045d6d036..2045d6d036 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index e3ced406be..e3ced406be 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 2b5beb9087..2b5beb9087 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 8ee442f4fe..8ee442f4fe 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index e98ba889d3..e98ba889d3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 5d8a5689b3..5d8a5689b3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 66f98adce3..66f98adce3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index f90a5cb8a1..f90a5cb8a1 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index 14ac8b0134..14ac8b0134 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
index 1a09307b3f..1a09307b3f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
index 099d5d1534..099d5d1534 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
index 3988959af0..3988959af0 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
index 69cf9d3d36..69cf9d3d36 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 7de5d5349f..7de5d5349f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 202a5ad8a4..202a5ad8a4 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 17686cafc0..17686cafc0 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index fa32e5bb54..fa32e5bb54 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
index 61fbf45986..61fbf45986 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
index 02c5593f86..02c5593f86 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
index d44c6f4dff..d44c6f4dff 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9666a6dbd8..9666a6dbd8 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 15ae762172..15ae762172 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-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/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 9c663a14ce..9c663a14ce 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-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/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
index ca0959b229..ca0959b229 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index 966ffc25e2..966ffc25e2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index 7b41e0f7aa..7b41e0f7aa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index a82a022088..a82a022088 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 43a9d0fe49..43a9d0fe49 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 5cad523218..5cad523218 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index 3696c8f073..3696c8f073 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 57d22fe18d..57d22fe18d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index e8fb4c6385..e8fb4c6385 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
index 9d4ee87ece..9d4ee87ece 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..875fdf35d2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..3eb81b61bd 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..aea7046a3d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
index b0b6644e7f..b0b6644e7f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
index 64c6423d5a..64c6423d5a 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 8f75de59e2..8f75de59e2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 33244e6087..33244e6087 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index 9e4f6d5d2b..9e4f6d5d2b 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index c50a4a5738..c50a4a5738 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
index c17da530b2..c17da530b2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
index d73cccb714..d73cccb714 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
index 438873a9fc..438873a9fc 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 4c5ea26ec2..4c5ea26ec2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 6ab2f0a670..6ab2f0a670 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 3719bbd79a..3719bbd79a 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 40be15c18d..40be15c18d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
index b41d79c3ba..b41d79c3ba 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
index 1758b41fda..1758b41fda 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index 6199821ff4..6199821ff4 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
index 7041c8923f..7041c8923f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
index c11d22d7b2..c11d22d7b2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-java-1.2.1/modules/interface/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/pom.xml
index 68648b48db..68648b48db 100644
--- a/branches/sca-java-1.2.1/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index ce00834572..ce00834572 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 2503c80f86..2503c80f86 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index a5e43791a5..a5e43791a5 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index cce99b4674..cce99b4674 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index 8176c1cb9c..8176c1cb9c 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 54edd3015a..54edd3015a 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index c4b2dd240d..c4b2dd240d 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index d9ff31ba92..d9ff31ba92 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 424303a4c7..424303a4c7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 272acb56ed..272acb56ed 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index c6c97e7036..c6c97e7036 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 556a68cf52..556a68cf52 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 298de62c08..298de62c08 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 3f96b56d31..3f96b56d31 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 591758fdb7..591758fdb7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 7706e972c7..7706e972c7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 5efa8ab15f..5efa8ab15f 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index f835caabef..f835caabef 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index d715c06101..d715c06101 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 06a65a11ad..06a65a11ad 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index dd4cf863d3..dd4cf863d3 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 779186a410..779186a410 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml
index 9892dc7ace..9892dc7ace 100644
--- a/branches/sca-java-1.2.1/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
index 5ef2aee114..5ef2aee114 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
index bae5a086b0..bae5a086b0 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
index d915a34cd8..d915a34cd8 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
index 676b0f7f8b..676b0f7f8b 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index 1cba8a08f4..1cba8a08f4 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
index f3b532ed8c..f3b532ed8c 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml
index 71a4d47d23..71a4d47d23 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
index 396b789794..396b789794 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
index b00825be45..b00825be45 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
index 1c208e2464..1c208e2464 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
index 42d4be1df4..42d4be1df4 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
index f1480d5ded..f1480d5ded 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
index dcfd186515..dcfd186515 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
index 5c6d372f11..5c6d372f11 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
index cd5bc37b84..cd5bc37b84 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
index 0c46050a4c..0c46050a4c 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
index 0c12d75a25..0c12d75a25 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
index c19c51f28a..c19c51f28a 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
index 137ae72467..137ae72467 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
index e53f353b53..e53f353b53 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
index fa01e64272..fa01e64272 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
index 5b63ad5a17..5b63ad5a17 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
index 5fbd3a3f6b..5fbd3a3f6b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
index 0305b4303b..0305b4303b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
index 783f61b2c2..783f61b2c2 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
index ff8987da01..ff8987da01 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
index eef0374866..eef0374866 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
index 538ad2e4c8..538ad2e4c8 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
index 673de80c44..673de80c44 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
index c120fed3ca..c120fed3ca 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
index 392310da11..392310da11 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
index 119c52cbf8..119c52cbf8 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml
index 9be59d662d..9be59d662d 100644
--- a/branches/sca-java-1.2.1/modules/node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
index b3a856c276..b3a856c276 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
index ac51add4d7..ac51add4d7 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
index 6a22c3c8f4..6a22c3c8f4 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
index afb4e0c3ed..afb4e0c3ed 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index c4a83fd624..c4a83fd624 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
index ea20afaf71..ea20afaf71 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
index 96ff3a0c1a..96ff3a0c1a 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
index 37414486e0..37414486e0 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
index d63a6e1159..d63a6e1159 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
index 093dda4aec..093dda4aec 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml
index 92632f767e..92632f767e 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
index 8ddafcf8d9..8ddafcf8d9 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
index 4fd3e35668..4fd3e35668 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
index e956993dbc..e956993dbc 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
index 6a2ce22156..6a2ce22156 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index c1cb1d9612..c1cb1d9612 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 0bb9e18a54..0bb9e18a54 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
index 44d0b59e6b..44d0b59e6b 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
index a739302ce6..a739302ce6 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
index 0fdfa51645..0fdfa51645 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index f661f9019d..f661f9019d 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index be416ec68b..be416ec68b 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index d8124037fe..d8124037fe 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 6abd571b31..6abd571b31 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 63515b9cd1..63515b9cd1 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
index e1987fb877..e1987fb877 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
index 2764e72771..2764e72771 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
index a5f02c7b31..a5f02c7b31 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
index 9c3373ea8a..9c3373ea8a 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
index 5edf6fe130..5edf6fe130 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
index 7bffa9284e..7bffa9284e 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
index 1dbe75f431..1dbe75f431 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 88b8f1e021..88b8f1e021 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
index 8bc77b5bb6..8bc77b5bb6 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
index 5d05bc57c9..5d05bc57c9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 828792179e..828792179e 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index 7d89ad7869..7d89ad7869 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index d2400b149b..d2400b149b 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index f10eba75ad..f10eba75ad 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 33e33bc680..33e33bc680 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 9bbae8956f..9bbae8956f 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index feddc8c056..feddc8c056 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 472f76c680..472f76c680 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..f56f96e4b9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index e14c657d80..e14c657d80 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 68615a4356..68615a4356 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index ca96c8abd3..ca96c8abd3 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index 1589d6daf9..1589d6daf9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
index 53f529bb11..53f529bb11 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
index 69dee983ec..69dee983ec 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
index 33835787f5..33835787f5 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
index c70f3ce0d2..c70f3ce0d2 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
index 2faf7bef14..2faf7bef14 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
index 0493a900af..0493a900af 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71783b1306..71783b1306 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 5bae401538..5bae401538 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 352d6c693e..352d6c693e 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
index 037edd9718..037edd9718 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-security/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-security/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/pom.xml
index b4cd2ca87c..b4cd2ca87c 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
index e6e5d02559..e6e5d02559 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index c25c49976b..c25c49976b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 328c290fad..328c290fad 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index efe8178605..efe8178605 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index adac7721c4..adac7721c4 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index ee66eb4437..ee66eb4437 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e3d4ce6be1..e3d4ce6be1 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0fa98020f9..0fa98020f9 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 19129615f5..19129615f5 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
index 048ff408a7..048ff408a7 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
index 3c11fef865..3c11fef865 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index ab142bfc1c..ab142bfc1c 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index a5bc4c5492..a5bc4c5492 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index a13748f232..a13748f232 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
index 6cee454177..6cee454177 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f178876a72..f178876a72 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 27cfbea2b2..27cfbea2b2 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
index b5ac365b2c..b5ac365b2c 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
index 0795a4e5cf..0795a4e5cf 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
index 9f9088a380..9f9088a380 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d034e23a2..1d034e23a2 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index e9d9fab519..e9d9fab519 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index eeec814f60..eeec814f60 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index ff51b131b7..ff51b131b7 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
index 324fa03da6..324fa03da6 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index 41b7eb7377..41b7eb7377 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
index 8e8828aa62..8e8828aa62 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
index c6d4cf8aec..c6d4cf8aec 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 29e9ac3ff3..29e9ac3ff3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 7cfbfe29b3..7cfbfe29b3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index b887257efe..b887257efe 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
index 7f1f88ee41..7f1f88ee41 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 814476b4f9..814476b4f9 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
index 2b9cbd9b18..2b9cbd9b18 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 068edd1733..068edd1733 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 94b8b9faf1..94b8b9faf1 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index 40190b2e2f..40190b2e2f 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 1a830f3b19..1a830f3b19 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 3998ab58be..3998ab58be 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index cdd247b1a8..cdd247b1a8 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 5aafa74a9b..5aafa74a9b 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index b453681cef..b453681cef 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 993014cb03..993014cb03 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0741e3eb76..0741e3eb76 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 7cfbfe29b3..7cfbfe29b3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index b4a06a23e2..b4a06a23e2 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index 1c7d407aaf..1c7d407aaf 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 3728e8f2b4..3728e8f2b4 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.2.1/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/pom.xml
index 584742c257..584742c257 100644
--- a/branches/sca-java-1.2.1/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index e64abccedc..e64abccedc 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index a9b9ac4884..a9b9ac4884 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index 8a8342ed04..8a8342ed04 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index ad8aa4845e..ad8aa4845e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index c0dc78e742..c0dc78e742 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 9dd0be314b..9dd0be314b 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index 3d34f24e45..3d34f24e45 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index c7c5192a61..c7c5192a61 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index c0f2087ca6..c0f2087ca6 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 37d9553378..37d9553378 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index 8d8657da95..8d8657da95 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index f2d3f25b66..f2d3f25b66 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 95604be25a..95604be25a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 2aba59b37f..2aba59b37f 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index fea1c0bf1c..fea1c0bf1c 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index ee63086e14..ee63086e14 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index 4a86174a00..4a86174a00 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 757e4bcfc7..757e4bcfc7 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index 467ad16e2c..467ad16e2c 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 4bd9d5b7c7..4bd9d5b7c7 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 8dce444879..8dce444879 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index 014cd725d8..014cd725d8 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index 321cfee621..321cfee621 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 0160a6f3b0..0160a6f3b0 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index c5d1c8d44a..c5d1c8d44a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index cc61805671..cc61805671 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index 60d43ec92e..60d43ec92e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index e9782c4927..e9782c4927 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index 35c1d3637a..35c1d3637a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index d98ba8394e..d98ba8394e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index d7f87b1c5d..d7f87b1c5d 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/pom.xml
index 7f3f50fb1a..7f3f50fb1a 100644
--- a/branches/sca-java-1.2.1/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
index bd6b1a847d..bd6b1a847d 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
index ae05f0bd29..ae05f0bd29 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
index d29d4a3851..d29d4a3851 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
index 6978bee727..6978bee727 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
index a0d83168f7..a0d83168f7 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
index 62655b668e..62655b668e 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
index 769ac4912d..769ac4912d 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
index e4398b95fe..e4398b95fe 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
index a3e3f8f15e..a3e3f8f15e 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
index 90d55af0bb..90d55af0bb 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
index 5a409a6a6c..5a409a6a6c 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
index 4fe3eaff9b..4fe3eaff9b 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/pom.xml
index b02c389022..b02c389022 100644
--- a/branches/sca-java-1.2.1/modules/runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
index fd0dfe56cd..fd0dfe56cd 100644
--- a/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/pom.xml
index 228c9e04ba..228c9e04ba 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 616d4c6338..616d4c6338 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 51d5ae76ca..51d5ae76ca 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index e07f70c2fe..e07f70c2fe 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
index 13c972156e..13c972156e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
index 787b7aca08..787b7aca08 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
index 6b8541b279..6b8541b279 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
index 2aeeb14727..2aeeb14727 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
index fe5a3fe7e1..fe5a3fe7e1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
index 39fec24e92..39fec24e92 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
index 241dc6f55b..241dc6f55b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
index fe0fc9e415..fe0fc9e415 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
index 251f6cd410..251f6cd410 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
index 550f97c2ad..550f97c2ad 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
index 7b23951aef..7b23951aef 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
index 3f793405b1..3f793405b1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
index aa6e910f85..aa6e910f85 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
index 193e30bb49..193e30bb49 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
index 96cf59c7c2..96cf59c7c2 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
index d29b913bf5..d29b913bf5 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
index 02b70e688e..02b70e688e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
index a59728b2ad..a59728b2ad 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
Binary files differ
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
index 853ce5d235..853ce5d235 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
index fb00b4c8c1..fb00b4c8c1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
index 9fea3445b3..9fea3445b3 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
index e03da2431b..e03da2431b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
index 48d4be2d6e..48d4be2d6e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
index e6ac7d7701..e6ac7d7701 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
index f2ee87978b..f2ee87978b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index 9d96b7783d..9d96b7783d 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index 3e715e83a8..3e715e83a8 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
index 14686753b0..14686753b0 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
index 45ba8c0609..45ba8c0609 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
index 9dd1b3a15b..9dd1b3a15b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index 55dfdbe10f..55dfdbe10f 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
index 6c188a7ae7..6c188a7ae7 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index 16157396c7..16157396c7 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index 2737814cfe..2737814cfe 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
index c09600f5a6..c09600f5a6 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml
index 3bf91e1466..3bf91e1466 100644
--- a/branches/sca-java-1.2.1/modules/workspace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 6146ccdae2..6146ccdae2 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
index f3a7aa22c1..f3a7aa22c1 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
index 939733ee34..939733ee34 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index 649faafafa..649faafafa 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory