3556 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.4/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/pom.xml
index d5ff8f3c7b..d5ff8f3c7b 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 80c5e807fe..80c5e807fe 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index b07c91d1b3..b07c91d1b3 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index d0d11cd02b..d0d11cd02b 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 07e1507449..07e1507449 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index bc74773d85..bc74773d85 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 72744259f6..72744259f6 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 285bcc448d..285bcc448d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index aa4980fcb6..aa4980fcb6 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3bf5a1173b..3bf5a1173b 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 4c5d6f8f49..4c5d6f8f49 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 7dd95e3944..7dd95e3944 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 7b0751437a..7b0751437a 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index a63ccdf151..a63ccdf151 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index fc4e10654d..fc4e10654d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7a190dea9c..7a190dea9c 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 8cc5e5a5ec..8cc5e5a5ec 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
index abf0269c0f..abf0269c0f 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 5f8f976b84..5f8f976b84 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index f34ff1f8bc..f34ff1f8bc 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index e2aeb85d32..e2aeb85d32 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index b3760789c8..b3760789c8 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 1aede413a5..1aede413a5 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
index 387405fd8d..387405fd8d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 312b5c8fab..312b5c8fab 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 32a2d94220..32a2d94220 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index df09a56c38..df09a56c38 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 691145a30e..691145a30e 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index 16cefc58cf..16cefc58cf 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index af25109de1..af25109de1 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 76361d4b70..76361d4b70 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index b859779437..b859779437 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index 5188b1c91a..5188b1c91a 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 602d42a06a..602d42a06a 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index d6ec9b0ff0..d6ec9b0ff0 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
index 3c69d0ed67..3c69d0ed67 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 299eb8c197..299eb8c197 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index a221c23eec..a221c23eec 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 2719ee9162..2719ee9162 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite
index f8c0c5ea36..f8c0c5ea36 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite
diff --git a/branches/sca-java-1.4/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.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/branches/sca-java-1.4/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.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 3bda9ac31c..3bda9ac31c 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/LICENSE
index 646cd58e09..646cd58e09 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/NOTICE
index 637bbaccf9..637bbaccf9 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/pom.xml
index 5c0e71229f..5c0e71229f 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 69b2701e30..69b2701e30 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 82899ed8ed..82899ed8ed 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 93718aaa35..93718aaa35 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 2dd44f8e06..2dd44f8e06 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
index 2da2fedb1f..2da2fedb1f 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
index b93aa480d6..b93aa480d6 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index a7e781b18f..a7e781b18f 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
index a1adf10fd9..a1adf10fd9 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index 2c4875f36c..2c4875f36c 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca.xsd
index b4eae28bfe..b4eae28bfe 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index d400810835..d400810835 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index 788571de7b..788571de7b 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index bd36a8f52f..bd36a8f52f 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
index b998427ecb..b998427ecb 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index bacfdda781..bacfdda781 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index dbef8fbed6..dbef8fbed6 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 5af65aced2..5af65aced2 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
index 20385e7f2c..20385e7f2c 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
index 4331da0439..4331da0439 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
index 1f6f9abb16..1f6f9abb16 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
index 4a06bdd36a..4a06bdd36a 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index 5b85038126..5b85038126 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/wsdli.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/wsdli.xsd
index 79af5e9363..79af5e9363 100644
--- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/wsdli.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/wsdli.xsd
diff --git a/branches/sca-java-1.4/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/LICENSE
diff --git a/branches/sca-java-1.4/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/NOTICE
diff --git a/branches/sca-java-1.4/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/pom.xml
index b3f7972a52..b3f7972a52 100644
--- a/branches/sca-java-1.4/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/pom.xml
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 05f0e60981..05f0e60981 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index f8b7d4d236..f8b7d4d236 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
index 5bcbdd40eb..5bcbdd40eb 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 13d19b1757..13d19b1757 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ce40bc089b..ce40bc089b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 8832597343..8832597343 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index f9a62774e6..f9a62774e6 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
index 6b0c076ee5..6b0c076ee5 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index ee63497fbe..ee63497fbe 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
index 93e6c4d630..93e6c4d630 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 6770e87ee1..6770e87ee1 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2eb1bf21b0..2eb1bf21b0 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index d8c530585e..d8c530585e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
index 97708f9ef5..97708f9ef5 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7bac630d5b..7bac630d5b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
index 37ad8af0b3..37ad8af0b3 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index d2fae4d24a..d2fae4d24a 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index cf38894702..cf38894702 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
index 9743117174..9743117174 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 20a17e1bd0..20a17e1bd0 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
index eb2977d87a..eb2977d87a 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
index 84a9c648b6..84a9c648b6 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
index b2f662918c..b2f662918c 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
index 3445192c79..3445192c79 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
index 0643421a45..0643421a45 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
index 4913705e91..4913705e91 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
index c0702c87b3..c0702c87b3 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index 927330b139..927330b139 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
index 12ea86eac3..12ea86eac3 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
index d73286f7ab..d73286f7ab 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
index 85af173c0d..85af173c0d 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 282fe032ba..282fe032ba 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 5779ddbc78..5779ddbc78 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index 539ad8d137..539ad8d137 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
index 76ed861167..76ed861167 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
index 5a6437b3a3..5a6437b3a3 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
index 41462b151d..41462b151d 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
index 8aa1897311..8aa1897311 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
index 3aa9f3bf85..3aa9f3bf85 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
index a3f31ea2fa..a3f31ea2fa 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
index ea0e88ac24..ea0e88ac24 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
index 1698b1a9c7..1698b1a9c7 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
index 944cf2cf36..944cf2cf36 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index c0bc18dfaf..c0bc18dfaf 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index e85aec8cea..e85aec8cea 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 03f24dfae8..03f24dfae8 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
index 0105d4af50..0105d4af50 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 23d547efaf..23d547efaf 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
index 41a8b3f8ba..41a8b3f8ba 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 488023090c..488023090c 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 9dd26b5e8e..9dd26b5e8e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 1373ce511b..1373ce511b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 491c835246..491c835246 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
index ece51cbe9b..ece51cbe9b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 5748abb07d..5748abb07d 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index aa75922489..aa75922489 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 1800222bfb..1800222bfb 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 8d745cb7e1..8d745cb7e1 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index 8dbff76ad9..8dbff76ad9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages.properties
index 6aeda18aab..6aeda18aab 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 8a3a89aba4..8a3a89aba4 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 5e0a2335d1..5e0a2335d1 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index fabafc998b..fabafc998b 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index 82b1fd8665..82b1fd8665 100644
--- a/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptToms.gif b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptToms.gif
index bfeee9b2f4..bfeee9b2f4 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptToms.gif
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptToms.gif
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptValue.jpg b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptValue.jpg
index 584f39ea8d..584f39ea8d 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptValue.jpg
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/ReceiptValue.jpg
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/pom.xml
index 55b6a2342c..55b6a2342c 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/pom.xml
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index 7219a3395b..7219a3395b 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index f6c713fae7..f6c713fae7 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index b6b805e383..b6b805e383 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index 62fde86122..62fde86122 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index f2b1d1f72b..f2b1d1f72b 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index e1d470f5a3..e1d470f5a3 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
index 7688a5dd26..7688a5dd26 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
index 03a427f11c..03a427f11c 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
index e9e0e315ab..e9e0e315ab 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
index c46634e784..c46634e784 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
index 6beed6881f..6beed6881f 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index 34d3ed1d1c..34d3ed1d1c 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 9af85a970c..9af85a970c 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index 08f8e3db2a..08f8e3db2a 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index bc32b91367..bc32b91367 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 3e5705b14c..3e5705b14c 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index db66b00a50..db66b00a50 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
index 5d5953aaaa..5d5953aaaa 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
index 0aabf225a4..0aabf225a4 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index 3e1bf543e5..3e1bf543e5 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
index 703419f527..703419f527 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
index 4915f7426e..4915f7426e 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
index 96ea508210..96ea508210 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index a2c50f872e..a2c50f872e 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 60097ee0f7..60097ee0f7 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 71aa932a12..71aa932a12 100644
--- a/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
diff --git a/branches/sca-java-1.4/modules/binding-atom/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-atom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-atom/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-atom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-atom/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/pom.xml
index bad21c27e3..bad21c27e3 100644
--- a/branches/sca-java-1.4/modules/binding-atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 807d6a8971..807d6a8971 100644
--- a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 1c68ab5bc1..1c68ab5bc1 100644
--- a/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 63dffd5522..63dffd5522 100644
--- a/branches/sca-java-1.4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/pom.xml
index da57975118..da57975118 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
index 99c9d7736e..99c9d7736e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
index 1577184b48..1577184b48 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
index 43bf984440..43bf984440 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
index 0465dbe7e9..0465dbe7e9 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
index 6e54556a2c..6e54556a2c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
index 9a11d205f2..9a11d205f2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
index 3936bed9f6..3936bed9f6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
index 25463a7a8a..25463a7a8a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
index 514d7055a8..514d7055a8 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
index 7fba091b41..7fba091b41 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
index ff4732cfdb..ff4732cfdb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
index 2a032f5d25..2a032f5d25 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
index a82e43e42e..a82e43e42e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
index 5ad9068b8d..5ad9068b8d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
index d93036d6d9..d93036d6d9 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
index d2b48d22c7..d2b48d22c7 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
index 4080a836bc..4080a836bc 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
index b8c4f88324..b8c4f88324 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
index e8441ed177..e8441ed177 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
index 7d2183fb01..7d2183fb01 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
index df6358d118..df6358d118 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
index 6dbeda3b7c..6dbeda3b7c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
index 87d3e93d22..87d3e93d22 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
index eb02f1cbcb..eb02f1cbcb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
index 71f8fbfc47..71f8fbfc47 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
index c5019c5c0b..c5019c5c0b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
index 6220802ce6..6220802ce6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
index 3214f8b30d..3214f8b30d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
index b11175064c..b11175064c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
index 7b4300a1da..7b4300a1da 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
index 4e0c2893d2..4e0c2893d2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
index 5862838cd5..5862838cd5 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
index 9130db65e4..9130db65e4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
index 4d782efcc5..4d782efcc5 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
index 365d62fb73..365d62fb73 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
index c9d0dd263f..c9d0dd263f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
index 72e4ccc6fb..72e4ccc6fb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
index 66c928acec..66c928acec 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
index 68f71b7169..68f71b7169 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
index 912d355641..912d355641 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
index a9fabcb82a..a9fabcb82a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
index 24661323be..24661323be 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
index 101bda1ba2..101bda1ba2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
index 3a46fc2b5f..3a46fc2b5f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 394e7bbd05..394e7bbd05 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index 7fc58c9b96..7fc58c9b96 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 6521255d3b..6521255d3b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index f0dccd9e7e..f0dccd9e7e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index 725ce0ec41..725ce0ec41 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 0dd34c26e8..0dd34c26e8 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 962a00d002..962a00d002 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
index f8c7717fff..f8c7717fff 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
index 85dc2b3acc..85dc2b3acc 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
index f1b84e492b..f1b84e492b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
index 13b2c6afb6..13b2c6afb6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
index 0128f70126..0128f70126 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
index 9492ab19f7..9492ab19f7 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
index 2712ac38f1..2712ac38f1 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
index 9d9e4ff494..9d9e4ff494 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
index 0b185c78eb..0b185c78eb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
index 5d1df4f68f..5d1df4f68f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
index c97fcbcc97..c97fcbcc97 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
index a456843599..a456843599 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
index 4021b1f17d..4021b1f17d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
index 88d6e033f1..88d6e033f1 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
index 711f9edbaa..711f9edbaa 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
index 481ca29621..481ca29621 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
index da24ea3746..da24ea3746 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
index e3c28f8b91..e3c28f8b91 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
index 775cac8e16..775cac8e16 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
index 32cd9c8df6..32cd9c8df6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
index 3f73557952..3f73557952 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
index a6160a7643..a6160a7643 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
index 6afa6bc806..6afa6bc806 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
index bab0c27f77..bab0c27f77 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
index 514627ff4b..514627ff4b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
index 4629ca9cff..4629ca9cff 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
index aa480f93ac..aa480f93ac 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
index 5ed36ca19b..5ed36ca19b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
index ec1cfadd1e..ec1cfadd1e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
index 29865ace06..29865ace06 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
index d7839ec4db..d7839ec4db 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
index c47d63208f..c47d63208f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
index f767e8c11a..f767e8c11a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
index e7cbb4b8ca..e7cbb4b8ca 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
index 5d27f9969c..5d27f9969c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
index ab01c66675..ab01c66675 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
index f4ea58e55e..f4ea58e55e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
index 82609a36c1..82609a36c1 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
index 1389bd33d9..1389bd33d9 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
index a73e252129..a73e252129 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
index 65ce051129..65ce051129 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index fde204edf8..fde204edf8 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 71b4fbbdb6..71b4fbbdb6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index d758a560a9..d758a560a9 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 464c2ccbc3..464c2ccbc3 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index c053f12a02..c053f12a02 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index 566689960e..566689960e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index 6564957081..6564957081 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index 26669de95a..26669de95a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index 5a140f5ecc..5a140f5ecc 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 2a8fe73417..2a8fe73417 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 63e3926dd2..63e3926dd2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index a8231236eb..a8231236eb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index ca86420240..ca86420240 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index 2a8898d38f..2a8898d38f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index bed30e00ca..bed30e00ca 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 73dbd6c198..73dbd6c198 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 8f524ffeb1..8f524ffeb1 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index 3231a136dc..3231a136dc 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 28d3ecdc91..28d3ecdc91 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 29ff2edfd2..29ff2edfd2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index b8aea13c8d..b8aea13c8d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 0bacb6746a..0bacb6746a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index c6e8c2a4e0..c6e8c2a4e0 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 079cc6e899..079cc6e899 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index b444ce68d8..b444ce68d8 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index 0b08e1fb67..0b08e1fb67 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index a87534f88b..a87534f88b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index e219dfa338..e219dfa338 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index c0bc0d6ebd..c0bc0d6ebd 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index ad47595ddf..ad47595ddf 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index f3d96e8fd7..f3d96e8fd7 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index cb0ab8bcfd..cb0ab8bcfd 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index 0bde1e701c..0bde1e701c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 19b2942cfe..19b2942cfe 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index 8bb5a9c69d..8bb5a9c69d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index dc89e71092..dc89e71092 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 7b71aa0a9f..7b71aa0a9f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 513bab37cc..513bab37cc 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index c1d06e2ba9..c1d06e2ba9 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index f9ad7b77ac..f9ad7b77ac 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index cfb292fc01..cfb292fc01 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 02f46a7d85..02f46a7d85 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 505aa3f026..505aa3f026 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 5cbaa109ee..5cbaa109ee 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 2f792888fb..2f792888fb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 8b2ccc1f73..8b2ccc1f73 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index 67e224f0be..67e224f0be 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index 5d4adfba2d..5d4adfba2d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index c7d86d9179..c7d86d9179 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 09b2b85c6a..09b2b85c6a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index e88b1e06c4..e88b1e06c4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index d3f996c5b4..d3f996c5b4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index 7c58d47f7c..7c58d47f7c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index 5be5a65c43..5be5a65c43 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index a40d5fa8de..a40d5fa8de 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 76f99408f2..76f99408f2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index d7594b0815..d7594b0815 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index e9fbcccc36..e9fbcccc36 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
index 6ef187c4e5..6ef187c4e5 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
index 59bc015c38..59bc015c38 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index ec4526cebf..ec4526cebf 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index 56ab28f0be..56ab28f0be 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 73a10d3b7f..73a10d3b7f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index c5c1e87756..c5c1e87756 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index 3e45568f01..3e45568f01 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index bdbf9d995b..bdbf9d995b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
index 7f90520d67..7f90520d67 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
index 7c33b1d449..7c33b1d449 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
index d0ebff5fec..d0ebff5fec 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
index baf5043bc2..baf5043bc2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
index 9ad637fc55..9ad637fc55 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
index 0c9de5bb31..0c9de5bb31 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
index 8746eb7f9b..8746eb7f9b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
index 6d124b0485..6d124b0485 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
index 8cf66e2fac..8cf66e2fac 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
index 5f361512f0..5f361512f0 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
index adc81ea5a2..adc81ea5a2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
index c3fd45d5f4..c3fd45d5f4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
index f6d5421a56..f6d5421a56 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
index 0d1bdd0a13..0d1bdd0a13 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
index 3afe702f87..3afe702f87 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
index 9d30e5ced1..9d30e5ced1 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
index a514b5e222..a514b5e222 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
index 2ea40e345f..2ea40e345f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
index 85ca3798f4..85ca3798f4 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
index d8cdf1835a..d8cdf1835a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
index bb72fdbbf3..bb72fdbbf3 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
index 606d333bb3..606d333bb3 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
index 0ff9540502..0ff9540502 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
index 912bd16f9b..912bd16f9b 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
index 79f7959c72..79f7959c72 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
index 495a614d84..495a614d84 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
index 11cfc82ac2..11cfc82ac2 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
index e0e56d1017..e0e56d1017 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
index c706661eaa..c706661eaa 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
index c9a31deb27..c9a31deb27 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
index a6b55b8bae..a6b55b8bae 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
index e06a078a93..e06a078a93 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
index 0aec4d278d..0aec4d278d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
index d9bde48a5a..d9bde48a5a 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
index cd78588363..cd78588363 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
index fd789e19cb..fd789e19cb 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
index 2e205f1d0f..2e205f1d0f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
index 52386aeef7..52386aeef7 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
index b7fbb69627..b7fbb69627 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
index dda8203f79..dda8203f79 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
index 20700a0392..20700a0392 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
index 213c7fbd7c..213c7fbd7c 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
index 92e18741ae..92e18741ae 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 153268983f..153268983f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
index 7ebc3fce85..7ebc3fce85 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
index 2c5a0d8159..2c5a0d8159 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
index d691705955..d691705955 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index 90551ec25d..90551ec25d 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index 6fc5f9398e..6fc5f9398e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index 5b7caf1010..5b7caf1010 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
index 0f4ed03b4e..0f4ed03b4e 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/enums.idl
index 2e4e829b0f..2e4e829b0f 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/enums.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/exceptions.idl
index b34ec46458..b34ec46458 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/exceptions.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/general_tests.idl
index db253338c3..db253338c3 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/references.idl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/references.idl
index 72b58806e6..72b58806e6 100644
--- a/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/references.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/resources/references.idl
diff --git a/branches/sca-java-1.4/modules/binding-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-corba/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-corba/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/pom.xml
index 3358437ea7..3358437ea7 100644
--- a/branches/sca-java-1.4/modules/binding-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index 0b79065cc3..0b79065cc3 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
index 67e3bdcf74..67e3bdcf74 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
index cecb4fb567..cecb4fb567 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
index 54e98d4117..54e98d4117 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index 0bb38d3682..0bb38d3682 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
index 57959840d4..57959840d4 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
diff --git a/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71d14bc077..71d14bc077 100644
--- a/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-dwr/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-dwr/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/pom.xml
index 9a715dc015..9a715dc015 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index ae5cf327ab..ae5cf327ab 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
index d14751f235..d14751f235 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
index 24e6dbbcd4..24e6dbbcd4 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
index 1d073c9ecf..1d073c9ecf 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
index 7d5a7f1677..7d5a7f1677 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
index 3a2471d8f3..3a2471d8f3 100644
--- a/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/pom.xml
index 4f70110eab..4f70110eab 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index c65868c23b..c65868c23b 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index 82554a1c8f..82554a1c8f 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index de8090c45b..de8090c45b 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 9247c1d3db..9247c1d3db 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index a6ea583d0b..a6ea583d0b 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 2a02bf0d08..2a02bf0d08 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index d41dbd0a0f..d41dbd0a0f 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 0b97f42746..0b97f42746 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index d34cfe1b16..d34cfe1b16 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index b699a02d1d..b699a02d1d 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index e60e526e01..e60e526e01 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 5e7d6761d9..5e7d6761d9 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e7ea7c9077..e7ea7c9077 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 346b7c5cf6..346b7c5cf6 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a89f711da9..a89f711da9 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
index 28dafedaeb..28dafedaeb 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/Customer.java
index 49ece71f7a..49ece71f7a 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
index 3d3f785a50..3d3f785a50 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
index 799bcaa672..799bcaa672 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index e480e648d9..e480e648d9 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 0d02be3b95..0d02be3b95 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index 82471acb16..82471acb16 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 48e87fb6d1..48e87fb6d1 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 66b3feb458..66b3feb458 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/branches/sca-java-1.4/modules/binding-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/pom.xml
index 0d363a19df..0d363a19df 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index 271a113429..271a113429 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 6e2c8d358f..6e2c8d358f 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index e84de86eca..e84de86eca 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index 4abed80aa3..4abed80aa3 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 9a487e02d1..9a487e02d1 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
index c445a82ecb..c445a82ecb 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/binding-feed/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-feed/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-feed/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-feed/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-feed/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/pom.xml
index f7903209a1..f7903209a1 100644
--- a/branches/sca-java-1.4/modules/binding-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
index 00aa813af2..00aa813af2 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
index 050ba9b73c..050ba9b73c 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
index 81b9fd95ad..81b9fd95ad 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
index c95c8ac012..c95c8ac012 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
index 30068afa0a..30068afa0a 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
index 39a4213a65..39a4213a65 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
index 503f30e685..503f30e685 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
index a9a1167544..a9a1167544 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
index 76551bc412..76551bc412 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
index 4d8fb943f0..4d8fb943f0 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
index 9df2ec60da..9df2ec60da 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
index 45b35d9206..45b35d9206 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
index 9a858f899f..9a858f899f 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
index 7adbfca6e8..7adbfca6e8 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
index d9bda1fb9a..d9bda1fb9a 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
index 23c36f51e3..23c36f51e3 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
index 89366456f5..89366456f5 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
index c5bd3ec009..c5bd3ec009 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
index f4c336e12b..f4c336e12b 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
index 278ed9cb7e..278ed9cb7e 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
index 779b28cef6..779b28cef6 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index f81a0d33ae..f81a0d33ae 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
index 4a33637121..4a33637121 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
index b7416011ba..b7416011ba 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
index 884e954036..884e954036 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
index ca4a5a1946..ca4a5a1946 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
index a9ddc1a2c8..a9ddc1a2c8 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/pom.xml
index c91e851dd4..c91e851dd4 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
index 8bff8631a6..8bff8631a6 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
index 699e9f0172..699e9f0172 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
index 4fc32d4d37..4fc32d4d37 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
index 9575b2ebd0..9575b2ebd0 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
index a615b2067e..a615b2067e 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
index 9be7ba6392..9be7ba6392 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
index 3d476df764..3d476df764 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
index 7656754bca..7656754bca 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
index 10faf74371..10faf74371 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5e380eb4e0..5e380eb4e0 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
index 5148e2ef2d..5148e2ef2d 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
index 2517c7233a..2517c7233a 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
index 3ac79e5f0a..3ac79e5f0a 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
index 7aa0a8961c..7aa0a8961c 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
index a2b1da894d..a2b1da894d 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
index 3c11fb70b9..3c11fb70b9 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
index b4f6ec7b36..b4f6ec7b36 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
index 882716575b..882716575b 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
index 959c153074..959c153074 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
index 96484cdf29..96484cdf29 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
index 21bff30256..21bff30256 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
index 2773398426..2773398426 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/log4j.properties
index 33eaf11c1f..33eaf11c1f 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
index a7941a2056..a7941a2056 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
index 078873c44f..078873c44f 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
index 7e0c925482..7e0c925482 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
index bc1ea7a8a9..bc1ea7a8a9 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
index 99db48cc4e..99db48cc4e 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
index a4cf00dc84..a4cf00dc84 100644
--- a/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
diff --git a/branches/sca-java-1.4/modules/binding-gdata/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-gdata/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/NOTICE
index a86f96ba80..a86f96ba80 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-gdata/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/pom.xml
index 790801a4b5..790801a4b5 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
index a3a0b834cd..a3a0b834cd 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
index 5cfc688dcb..5cfc688dcb 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
index 87f3597248..87f3597248 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
index b4b0a5f449..b4b0a5f449 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
index 01551e3e82..01551e3e82 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
index 21688a62a6..21688a62a6 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
diff --git a/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4e71818f7b..4e71818f7b 100644
--- a/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/pom.xml
index 95ce027591..95ce027591 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
index 084f52026f..084f52026f 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index fccd10f3cd..fccd10f3cd 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 8f91ff4343..8f91ff4343 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index 493255655d..493255655d 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
index 1fe4600e31..1fe4600e31 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 0fa8d44c08..0fa8d44c08 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
index bb5f6d5a8b..bb5f6d5a8b 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index e5cad080a6..e5cad080a6 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
index 1d6efea2a1..1d6efea2a1 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
index 5728899ebe..5728899ebe 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
index f2456f3175..f2456f3175 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 333bacbab3..333bacbab3 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
index ed846c1127..ed846c1127 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index 11945c8cd1..11945c8cd1 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/test.composite
index 62c4af4e22..62c4af4e22 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/testCache.composite
index d805402c4f..d805402c4f 100644
--- a/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/branches/sca-java-1.4/modules/binding-http/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-http/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/pom.xml
index 803cb76782..803cb76782 100644
--- a/branches/sca-java-1.4/modules/binding-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..6192b92dfe 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index 370e4cdb67..370e4cdb67 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
index 023423f0eb..023423f0eb 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
index 69e44cf35c..69e44cf35c 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 7e72b7dd85..7e72b7dd85 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index 6d4bf92adc..6d4bf92adc 100644
--- a/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/pom.xml
index aee8d92442..aee8d92442 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
index de54545f7e..de54545f7e 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
index 16ed2a53a4..16ed2a53a4 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
index 11747914da..11747914da 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
index fd77e57418..fd77e57418 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
index 56fffeb817..56fffeb817 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
index b4fa617f74..b4fa617f74 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
index c8d28ad5db..c8d28ad5db 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
index 4b0944a420..4b0944a420 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
index 1c16e3fa1b..1c16e3fa1b 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
index d6167b4895..d6167b4895 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
index ded3da05b9..ded3da05b9 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
index 58100cfb8d..58100cfb8d 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
index 3983541de3..3983541de3 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e6f22e327c..e6f22e327c 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index b04c71d8e3..b04c71d8e3 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 0598cdc368..0598cdc368 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
index fd43b2c4e9..fd43b2c4e9 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
index c87079dd54..c87079dd54 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
index a9da07ca7d..a9da07ca7d 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
index 3631c682aa..3631c682aa 100644
--- a/branches/sca-java-1.4/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/pom.xml
index 438b86a97b..438b86a97b 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
index 6370c9f575..6370c9f575 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
index a361d8159b..a361d8159b 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
index 64d01b2863..64d01b2863 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
index a1319ad1f0..a1319ad1f0 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
index 1cceb4e382..1cceb4e382 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
index e229cc9043..e229cc9043 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
index 44b2e3b990..44b2e3b990 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
index f5c60e0bb5..f5c60e0bb5 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
index 499f69a24b..499f69a24b 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 46d71897ad..46d71897ad 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index a96e53d9e1..a96e53d9e1 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index e7562000e9..e7562000e9 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index 0aabc9a7a5..0aabc9a7a5 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 821b9d7873..821b9d7873 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 699b1cb176..699b1cb176 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 773be84c7f..773be84c7f 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
index 57fbfb3215..57fbfb3215 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
index d0624fb52e..d0624fb52e 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index e9ae3cecaa..e9ae3cecaa 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
index a4cc79426e..a4cc79426e 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
index 4821943bd3..4821943bd3 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index d8490c6223..d8490c6223 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
index 88dd41cc57..88dd41cc57 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
index 62b51bd797..62b51bd797 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
index 91868204ac..91868204ac 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
index aa5df2b8bb..aa5df2b8bb 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
index f0e835e916..f0e835e916 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
index 00aa060ce7..00aa060ce7 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
index 5a41a0f62f..5a41a0f62f 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
index 8cf1bc7e4d..8cf1bc7e4d 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
index 9e92bf40bf..9e92bf40bf 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
index e0df4f2296..e0df4f2296 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
index 42719e842f..42719e842f 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
index b06886fae0..b06886fae0 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
index 9b1b405fac..9b1b405fac 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
index 555dfb47b5..555dfb47b5 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
index fab51a08f0..fab51a08f0 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
index f7d125dd3e..f7d125dd3e 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
index 43e0d3e772..43e0d3e772 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
index f8fff8e981..f8fff8e981 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
index 44f490ee37..44f490ee37 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
index d0f10b8ba7..d0f10b8ba7 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
index 69369cd268..69369cd268 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
index 778062d945..778062d945 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
index 2a2332f5fb..2a2332f5fb 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index dec0991984..dec0991984 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
index 99438fcd06..99438fcd06 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
index 02ae135f16..02ae135f16 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index fb80362457..fb80362457 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 515da3144a..515da3144a 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index a8808c1bd1..a8808c1bd1 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
index 1cf8edb6a6..1cf8edb6a6 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/branches/sca-java-1.4/modules/binding-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/pom.xml
index 16c12ef47d..16c12ef47d 100644
--- a/branches/sca-java-1.4/modules/binding-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index 90b4d2488b..90b4d2488b 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
index adb9f29460..adb9f29460 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
index 0928e02082..0928e02082 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index 6ab439748a..6ab439748a 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
index 71d1298c9b..71d1298c9b 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
index 4a8e4a1bd2..4a8e4a1bd2 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
index 84d1a2740f..84d1a2740f 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
index 2d807d49cb..2d807d49cb 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
index 7e39f696bd..7e39f696bd 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
index 806b713931..806b713931 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
index fff33df1f4..fff33df1f4 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
index 9b675df290..9b675df290 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
index 23a53b9d96..23a53b9d96 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
index 8248fc771a..8248fc771a 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e5b8a96783..e5b8a96783 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
index 2f1048e601..2f1048e601 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
index 7fe482c4f2..7fe482c4f2 100644
--- a/branches/sca-java-1.4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/pom.xml
index 24eabdb6cc..24eabdb6cc 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index a9fff462fa..a9fff462fa 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index eb85453bbb..eb85453bbb 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e2528f59e5..e2528f59e5 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 8d9f8193e9..8d9f8193e9 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index c0d0415f91..c0d0415f91 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
index 64339fda7b..64339fda7b 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
index 999588abf1..999588abf1 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index ba87f22cf6..ba87f22cf6 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index bf8c7d2c8a..bf8c7d2c8a 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 3e7b848221..3e7b848221 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
index 6d156fcdf5..6d156fcdf5 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
index 52518e1bbc..52518e1bbc 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index 67d3eda6b2..67d3eda6b2 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 978fdcfa7f..978fdcfa7f 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/pom.xml
index c564637c1b..c564637c1b 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index ce86365980..ce86365980 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
index 707a9d7103..707a9d7103 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
index 625457a668..625457a668 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 1ee3631a98..1ee3631a98 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
index 8b9662997d..8b9662997d 100644
--- a/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
diff --git a/branches/sca-java-1.4/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.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f39251068..0f39251068 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/pom.xml
index b47b8fe3da..b47b8fe3da 100644
--- a/branches/sca-java-1.4/modules/binding-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
index 8e6a78551a..8e6a78551a 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
index 940a69784b..940a69784b 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
index 31a8b26c02..31a8b26c02 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
index f4c210ba7c..f4c210ba7c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
index 7fdeee189b..7fdeee189b 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
index 892700779f..892700779f 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
index e5ea616fdb..e5ea616fdb 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
index 8a6d57e825..8a6d57e825 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
index 8980fa26ff..8980fa26ff 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
index c1a8162836..c1a8162836 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
index 4511fb454b..4511fb454b 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
index 101d05f9cb..101d05f9cb 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
index 527cfbd667..527cfbd667 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
index e99845d886..e99845d886 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
index 76eb204f21..76eb204f21 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
index 536801016c..536801016c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
index 3b2aacef4c..3b2aacef4c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
index 94357cd98d..94357cd98d 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
index 66f0a198e4..66f0a198e4 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
index e6e6b05a42..e6e6b05a42 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
index 7c53d529a8..7c53d529a8 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
index a500a2a854..a500a2a854 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
index a6a2b15a15..a6a2b15a15 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
index 209416c203..209416c203 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
index 24395ee0a6..24395ee0a6 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
index 1dba2533d2..1dba2533d2 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
index 5783d0de02..5783d0de02 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
index bec3e6ff29..bec3e6ff29 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
index 91ba05404a..91ba05404a 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
index 9012aaeb25..9012aaeb25 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
index ca64c15305..ca64c15305 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
index 1c678a2b96..1c678a2b96 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
index 8c6f684425..8c6f684425 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
index 5b28aedcf9..5b28aedcf9 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
index bf6094582e..bf6094582e 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
index ee12161903..ee12161903 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
index bf94da374c..bf94da374c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
index 92f10cd4b3..92f10cd4b3 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
index 264566aae4..264566aae4 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
index 8066184da9..8066184da9 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
index 5e3afc8195..5e3afc8195 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
index b43ad5c214..b43ad5c214 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
index 3840b1caf9..3840b1caf9 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
index f2a36d89db..f2a36d89db 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
index 8195c80c49..8195c80c49 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
index beba8fdc9b..beba8fdc9b 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
index cfc747f59e..cfc747f59e 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
index a9c901a431..a9c901a431 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
index 864de25fd6..864de25fd6 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
index b3f2c060fb..b3f2c060fb 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
index 979a6e8e34..979a6e8e34 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
index 902fd823cd..902fd823cd 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
index ad149e3e4f..ad149e3e4f 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
index 42f9e74a27..42f9e74a27 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
index fa05e2d7bd..fa05e2d7bd 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
index 92578af219..92578af219 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
index 48c34ba74f..48c34ba74f 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
index c9a3f1da79..c9a3f1da79 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
index 6e57ad41de..6e57ad41de 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
index 6f34fc0b7c..6f34fc0b7c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
index 2ad969e1a6..2ad969e1a6 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
index a47e1f4e55..a47e1f4e55 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
index 8eac326019..8eac326019 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
index 60fb23be02..60fb23be02 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
index fbcd041621..fbcd041621 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
index aa9180dcd7..aa9180dcd7 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
index 38cf9e9467..38cf9e9467 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
index 49a4259333..49a4259333 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
index 74d10fe02d..74d10fe02d 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
index 2ee9320f20..2ee9320f20 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
index 9d06dfea97..9d06dfea97 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
index 39050d158c..39050d158c 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
index 97834ea0a9..97834ea0a9 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
index 047c5e9a58..047c5e9a58 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
index 25f92c38c2..25f92c38c2 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
index 8145c6b170..8145c6b170 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
index 000f6690c7..000f6690c7 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
index aca5c70641..aca5c70641 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
index 04ee132b3e..04ee132b3e 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
index daac727cb6..daac727cb6 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
index f780514eda..f780514eda 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
index 42ccd5cdac..42ccd5cdac 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5e5ce97054..5e5ce97054 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
index 3d328339a7..3d328339a7 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
index 3dcd2b9b00..3dcd2b9b00 100644
--- a/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/pom.xml
index 3eb81849c3..3eb81849c3 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
index 746aa4dac1..746aa4dac1 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
index d09ea1f903..d09ea1f903 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
index d300cb7d05..d300cb7d05 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index 5d829162d9..5d829162d9 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index b188c24a20..b188c24a20 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
index cbc860ecc6..cbc860ecc6 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
index 0a1f4283db..0a1f4283db 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
index 5b20d17c83..5b20d17c83 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
index 461c176e1e..461c176e1e 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
index 3b705d2c97..3b705d2c97 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index a3c4ae4010..a3c4ae4010 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 65aec1681d..65aec1681d 100644
--- a/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-1.4/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/pom.xml
index 0c48cd475d..0c48cd475d 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index 4ef3822b5b..4ef3822b5b 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
index ecfd45def3..ecfd45def3 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
index 547fc633a8..547fc633a8 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
index 4acb9783f5..4acb9783f5 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
index 889fcafae2..889fcafae2 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
diff --git a/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index d628701a7f..d628701a7f 100644
--- a/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/pom.xml
index 2b89672ec2..2b89672ec2 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index bb8dab391b..bb8dab391b 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index e3a177198c..e3a177198c 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 7eb5aeb3df..7eb5aeb3df 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index b9cababcab..b9cababcab 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index 8a30e9d3fb..8a30e9d3fb 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index 4e5429ac83..4e5429ac83 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 19370285f5..19370285f5 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index e71156c379..e71156c379 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index d45be65e20..d45be65e20 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index ae7b72834e..ae7b72834e 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 43cd5e00b9..43cd5e00b9 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 5ffcb50eb8..5ffcb50eb8 100644
--- a/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.4/modules/binding-rss/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-rss/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-rss/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-rss/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-rss/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/pom.xml
index 63abcc576a..63abcc576a 100644
--- a/branches/sca-java-1.4/modules/binding-rss/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index 2b4989264c..2b4989264c 100644
--- a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index 6158752e7c..6158752e7c 100644
--- a/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/pom.xml
index 6da9a684f3..6da9a684f3 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index e4bb708a01..e4bb708a01 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index b105696b5d..b105696b5d 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 48d65cb735..48d65cb735 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index 58a50d46dc..58a50d46dc 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index cf13d821f7..cf13d821f7 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 40d64be9b1..40d64be9b1 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
index b345e563e3..b345e563e3 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
index 472e85116e..472e85116e 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index 76dbc5a5c7..76dbc5a5c7 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 2deb62e6c4..2deb62e6c4 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index 2d2a23d7df..2d2a23d7df 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
index e788526069..e788526069 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index 1a2788ac74..1a2788ac74 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index e4d36ac78b..e4d36ac78b 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a83fcb3069..a83fcb3069 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index c41548ec51..c41548ec51 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 7b8e00eb2a..7b8e00eb2a 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index 62d61e4fff..62d61e4fff 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index 2dcc8cc64b..2dcc8cc64b 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 8e7d2f8023..8e7d2f8023 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index 7d07c4ff43..7d07c4ff43 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 7098f10622..7098f10622 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index 07ae00bd31..07ae00bd31 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index 36854cb7b8..36854cb7b8 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index fd3e3a1158..fd3e3a1158 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index 3400e97447..3400e97447 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index 20dd97b74a..20dd97b74a 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 5f8ccf9466..5f8ccf9466 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index b25aebd9df..b25aebd9df 100644
--- a/branches/sca-java-1.4/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.4/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.4/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 5e4fd566c3..5e4fd566c3 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index 093258051e..093258051e 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index 8cf7230ed5..8cf7230ed5 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index 066727f76d..066727f76d 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index a5a4f04cb5..a5a4f04cb5 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index b519793290..b519793290 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index 20a6c54e6e..20a6c54e6e 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index a76008d0c5..a76008d0c5 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index 0c22af22ab..0c22af22ab 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/pom.xml
index 6ee4362bde..6ee4362bde 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
index 2eee714de6..2eee714de6 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
index a9cc890616..a9cc890616 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
index 32d5650f37..32d5650f37 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
index c578f8bdf4..c578f8bdf4 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
index 6e74686b61..6e74686b61 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
index 128d5ef159..128d5ef159 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e07a7cbb95..e07a7cbb95 100644
--- a/branches/sca-java-1.4/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/pom.xml
index 515e1f8720..515e1f8720 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
index 3216e51d6e..3216e51d6e 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
index f1acdd8190..f1acdd8190 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
index 28e7ff9797..28e7ff9797 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
index d839602198..d839602198 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f1b9825130..f1b9825130 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 8e53649af1..8e53649af1 100644
--- a/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-sca-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-sca-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/pom.xml
index 2ddae3c60f..2ddae3c60f 100644
--- a/branches/sca-java-1.4/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index a3e582c82e..a3e582c82e 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index a7c7c15eaa..a7c7c15eaa 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index db611fa413..db611fa413 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 0be16ec536..0be16ec536 100644
--- a/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index 55e8926504..55e8926504 100644
--- a/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.4/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-sca/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-sca/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/pom.xml
index 581bda6218..581bda6218 100644
--- a/branches/sca-java-1.4/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index 167c93e86d..167c93e86d 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
index bd24d4b14c..bd24d4b14c 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index 43b0cd8f4e..43b0cd8f4e 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
index 5ebbea62eb..5ebbea62eb 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
index 5c1cefb808..5c1cefb808 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
index 5dda74f72e..5dda74f72e 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
index 850fd77e96..850fd77e96 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
index 8994ba5381..8994ba5381 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index ea758823a9..ea758823a9 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index c93ddd9503..c93ddd9503 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
index 52c0f64fe5..52c0f64fe5 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5c6b8e21fc..5c6b8e21fc 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 22c9a64b05..22c9a64b05 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index ff396566d6..ff396566d6 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/test/resources/Calculator.composite
index 37b26f3d68..37b26f3d68 100644
--- a/branches/sca-java-1.4/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/pom.xml
index 3cdc7f1d73..3cdc7f1d73 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
index 8fecb84bb4..8fecb84bb4 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
index e8a7872858..e8a7872858 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
index cef881af30..cef881af30 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
index c6cd96e647..c6cd96e647 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
index 147fd1f42a..147fd1f42a 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
index 2928647445..2928647445 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
index e3e2a4b9a0..e3e2a4b9a0 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
index 8d08a3f78e..8d08a3f78e 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
index 5ac4e3f5fd..5ac4e3f5fd 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
index 6478fbedad..6478fbedad 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
index 21261359cb..21261359cb 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
index 244e501901..244e501901 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
index 3466b9def7..3466b9def7 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
index 71833df382..71833df382 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
index 98d011a8fc..98d011a8fc 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
index 1b3315bb76..1b3315bb76 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
index 0af5a09d8d..0af5a09d8d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
index a758ca5261..a758ca5261 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
index 126073beb7..126073beb7 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
index 7a1f26bf04..7a1f26bf04 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
index 0eefeac87b..0eefeac87b 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 96782b74bf..96782b74bf 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index ced48cf236..ced48cf236 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
index cf14e54b5f..cf14e54b5f 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/pom.xml
index cf818df942..cf818df942 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index d468370a7e..d468370a7e 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index c7eb2b7794..c7eb2b7794 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index f8d0cf55b0..f8d0cf55b0 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 958d4aa41d..958d4aa41d 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index 5b26290732..5b26290732 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 0d3916019f..0d3916019f 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index a0cfab9154..a0cfab9154 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index d467e0b3c8..d467e0b3c8 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index e82dd64ba5..e82dd64ba5 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index 746b850ff0..746b850ff0 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index 1f389b422f..1f389b422f 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index bd154dbc67..bd154dbc67 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index 34899a4af0..34899a4af0 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 21fef3e5d8..21fef3e5d8 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
index 5254a5716c..5254a5716c 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
index 4c18c89353..4c18c89353 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
index 647f934c02..647f934c02 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 370b83f87b..370b83f87b 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 6bff613a7c..6bff613a7c 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index ea32836f2a..ea32836f2a 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
index e6e70dfd4b..e6e70dfd4b 100644
--- a/branches/sca-java-1.4/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.4/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.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
index ec870734a5..ec870734a5 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
index 4e7c1b0539..4e7c1b0539 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
index 5edb4ddc5a..5edb4ddc5a 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
index 5c1ee6a435..5c1ee6a435 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
index 6fccbcfd00..6fccbcfd00 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
index f474c12af3..f474c12af3 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
index 274f6c8d28..274f6c8d28 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
index bf371430a1..bf371430a1 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 8e17b89f33..8e17b89f33 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
index b276d8210f..b276d8210f 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
index 59eb6164fa..59eb6164fa 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index 0508f28e11..0508f28e11 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
index 5efbedba4c..5efbedba4c 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
index 82f6ff4c5d..82f6ff4c5d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
index e592134037..e592134037 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
index ce79b47b86..ce79b47b86 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
index 8d4a020560..8d4a020560 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
index 6cdb12c221..6cdb12c221 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
index 67d6f1c56e..67d6f1c56e 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
index 45c5472100..45c5472100 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
index 7a4b50cc2c..7a4b50cc2c 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
index 18a713a243..18a713a243 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index 1fd1b8d48e..1fd1b8d48e 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
index 824132161c..824132161c 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
index 458a472479..458a472479 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
index 88fc0d63fa..88fc0d63fa 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
index 0d8914156f..0d8914156f 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
index 5840f71057..5840f71057 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
index 04de589fb1..04de589fb1 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
index cf342653c7..cf342653c7 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
index 84b64d3902..84b64d3902 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
index 04825b6b56..04825b6b56 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
index a439ff4c8f..a439ff4c8f 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index f37a8deeb7..f37a8deeb7 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
index 18bbf98628..18bbf98628 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 8d378565d4..8d378565d4 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index 5cea469e3d..5cea469e3d 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
index f09ed09b6a..f09ed09b6a 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
index ec67b84851..ec67b84851 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
index 7c903c6394..7c903c6394 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index dee0effd99..dee0effd99 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 8fcbdef33d..8fcbdef33d 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index c506b09bb2..c506b09bb2 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
index 5908c43e7d..5908c43e7d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
index 1c67a1b26a..1c67a1b26a 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
index 03a16d9433..03a16d9433 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 8fa2d3b8c0..8fa2d3b8c0 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
index 592edf183b..592edf183b 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index 65f8cb67d8..65f8cb67d8 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 871e889835..871e889835 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
index cb188e6676..cb188e6676 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index d7f40ccf0e..d7f40ccf0e 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
index 41a491361f..41a491361f 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
index 99a8c6d81d..99a8c6d81d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
index 80e4b62801..80e4b62801 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index 008d42d03d..008d42d03d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
diff --git a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 7fff56377b..7fff56377b 100644
--- a/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index c042ae5675..c042ae5675 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index fbd4c66c45..fbd4c66c45 100644
--- a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index 033a77eea6..033a77eea6 100644
--- a/branches/sca-java-1.4/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.4/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.4/modules/binding-ws-wsdlgen/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/pom.xml
index 06f3aa67ad..06f3aa67ad 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index de1cab15d8..de1cab15d8 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
index 933534cc79..933534cc79 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
index d0b79f9b0e..d0b79f9b0e 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
index bf9e22f645..bf9e22f645 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index bf3615c9f8..bf3615c9f8 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
index 4bfbdd2901..4bfbdd2901 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
index 7e6a1de546..7e6a1de546 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
index f10a2286e6..f10a2286e6 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
index e474c7a318..e474c7a318 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
index f1e12f8ce0..f1e12f8ce0 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
index 1e4f802e01..1e4f802e01 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
index da2c285bac..da2c285bac 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
index 64cce0e49d..64cce0e49d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
index 3fd7361ae1..3fd7361ae1 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
index 9635d65f99..9635d65f99 100644
--- a/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/pom.xml
index 52e73a1442..52e73a1442 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
index f2376231ab..f2376231ab 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
index ad2540e5fe..ad2540e5fe 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 980003ddf1..980003ddf1 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 03c84a6b41..03c84a6b41 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
index 9e2ff5830d..9e2ff5830d 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index ef955254c1..ef955254c1 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 0e519af9d3..0e519af9d3 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index d8d1b3401e..d8d1b3401e 100644
--- a/branches/sca-java-1.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
diff --git a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index f7460813cd..f7460813cd 100644
--- a/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.4/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/binding-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-1.4/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/binding-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-1.4/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/pom.xml
index 087a666c84..087a666c84 100644
--- a/branches/sca-java-1.4/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 2ccaa5dc58..2ccaa5dc58 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 0d07a55a14..0d07a55a14 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 055e2012dc..055e2012dc 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index d816c2c9c6..d816c2c9c6 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-1.4/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
index 6d50a24b93..6d50a24b93 100644
--- a/branches/sca-java-1.4/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/NOTICE
index aeeca5ef8d..aeeca5ef8d 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/pom.xml
index 8146c67b1b..8146c67b1b 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
index 77dab193b9..77dab193b9 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
index 4b7df4d9f8..4b7df4d9f8 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
index 82fe0326df..82fe0326df 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
index 788c42f07d..788c42f07d 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
index 02be3acd23..02be3acd23 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
index c172528538..c172528538 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
diff --git a/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
index 0d4c17a15b..0d4c17a15b 100644
--- a/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
diff --git a/branches/sca-java-1.4/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/pom.xml
index d75cdad66d..d75cdad66d 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index ab056e3214..ab056e3214 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 3df275a7a1..3df275a7a1 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index d567aa5c68..d567aa5c68 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 7b8b12ca9d..7b8b12ca9d 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 110450c469..110450c469 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index cd5e87ca42..cd5e87ca42 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index 630d1f6bf4..630d1f6bf4 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
index 158ee2102d..158ee2102d 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index c33b31b550..c33b31b550 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 9b3dce7029..9b3dce7029 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 46b4183380..46b4183380 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index 98852e951c..98852e951c 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index 01083cc6a6..01083cc6a6 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index 66ecd33da6..66ecd33da6 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
index a90f5b36ad..a90f5b36ad 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
index 49e9cc166b..49e9cc166b 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-1.4/modules/contribution-java/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-java/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/pom.xml
index 6e5897683b..6e5897683b 100644
--- a/branches/sca-java-1.4/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index af2ca9cd57..af2ca9cd57 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index 61c73bf2f8..61c73bf2f8 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index 962512a745..962512a745 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index aa68925376..aa68925376 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..f35f35ac4c 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
index 8d5412f6d7..8d5412f6d7 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index d7c3817b68..d7c3817b68 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index e5dc397f4e..e5dc397f4e 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
index 47cdc9767b..47cdc9767b 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..cc18d5f798 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 484eddd222..484eddd222 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index 7812c25c1c..7812c25c1c 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
index 09fc3e9fff..09fc3e9fff 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index 1405ad4bd5..1405ad4bd5 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index 3ae161642d..3ae161642d 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 0ec5bfba39..0ec5bfba39 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 9e43b744cf..9e43b744cf 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.4/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.4/modules/contribution-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/pom.xml
index 2c061515e7..2c061515e7 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
index 547ba52e74..547ba52e74 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
index 37ae53a38a..37ae53a38a 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
index 2ecabb9a23..2ecabb9a23 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
index 1187d1ed00..1187d1ed00 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
index deb9d9e755..deb9d9e755 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
index 3a80c1dd3b..3a80c1dd3b 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
index 17974e831f..17974e831f 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index 88c69658f6..88c69658f6 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
index b062187afb..b062187afb 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
index 9495df70b7..9495df70b7 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
index 85b5e87e7f..85b5e87e7f 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
index e315c417b9..e315c417b9 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
index 030fdc3d19..030fdc3d19 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
index 3efdd206c7..3efdd206c7 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
index 4b9e3b79f4..4b9e3b79f4 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
index 681b203fab..681b203fab 100644
--- a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/pom.xml
index 5e17a94c42..5e17a94c42 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
index a71fa61a54..a71fa61a54 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 8991585d32..8991585d32 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
index 5c5ae22f77..5c5ae22f77 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index a316818b0f..a316818b0f 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
index 7ea09a47c7..7ea09a47c7 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 6d2a31f702..6d2a31f702 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index a364823256..a364823256 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
index c1cbd06e7f..c1cbd06e7f 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 1f508d6a4a..1f508d6a4a 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 71ac33bf68..71ac33bf68 100644
--- a/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/pom.xml
index 62326f3fb5..62326f3fb5 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 0bbb8b707a..0bbb8b707a 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
index 5033d7eefc..5033d7eefc 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index b3c2302f60..b3c2302f60 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 07e80f66f3..07e80f66f3 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 528a287328..528a287328 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
index 15ad0bd948..15ad0bd948 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
index e624b1d3b5..e624b1d3b5 100644
--- a/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.4/modules/contribution-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/pom.xml
index fe4e997075..fe4e997075 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
index 0bd30c19dd..0bd30c19dd 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
index 07eac9d843..07eac9d843 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
index 4119c344ce..4119c344ce 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
index e614b47fc7..e614b47fc7 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
index c2d525dfef..c2d525dfef 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
index fd568e533d..fd568e533d 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index cf99aee389..cf99aee389 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
index 880f5f5786..880f5f5786 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
index e7aecad786..e7aecad786 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
index cd33f1290f..cd33f1290f 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index bc3fb7fa5f..bc3fb7fa5f 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
index 9df66cce52..9df66cce52 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
index ea44cb506b..ea44cb506b 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
index 1ff931c162..1ff931c162 100644
--- a/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/pom.xml
index 16f264ad05..16f264ad05 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
index 36e959ea21..36e959ea21 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
index 2b868b9e45..2b868b9e45 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
index 70398deaa9..70398deaa9 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
index 351929d8a1..351929d8a1 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
index 66361e1d76..66361e1d76 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index a4cf1b3566..a4cf1b3566 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index f74a87d890..f74a87d890 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index dd1a3a677e..dd1a3a677e 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index f226dbbee3..f226dbbee3 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b69ea1e135..b69ea1e135 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 23adab56b9..23adab56b9 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
index 4827fd5e94..4827fd5e94 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 8f69f15cd1..8f69f15cd1 100644
--- a/branches/sca-java-1.4/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/LICENSE
diff --git a/branches/sca-java-1.4/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/NOTICE
diff --git a/branches/sca-java-1.4/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/pom.xml
index fe52a99293..fe52a99293 100644
--- a/branches/sca-java-1.4/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/pom.xml
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 7400501d85..7400501d85 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
index 14131a9806..14131a9806 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 743c2356d7..743c2356d7 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 67c9a05a0b..67c9a05a0b 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
index 4043fb9eda..4043fb9eda 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
index b2eddb8336..b2eddb8336 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
index 20798dcd17..20798dcd17 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index b69c58a0ff..b69c58a0ff 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index ffe190132c..ffe190132c 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 35076f55a7..35076f55a7 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 0ada4ebec3..0ada4ebec3 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index 26833bb4c0..26833bb4c0 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 881987f622..881987f622 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index c678c2eaef..c678c2eaef 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index fc9ae607e7..fc9ae607e7 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
index 75b12b1260..75b12b1260 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
index e67395337a..e67395337a 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
index 17c09f2cbc..17c09f2cbc 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index b5f536c431..b5f536c431 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index f23797a831..f23797a831 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 3c67a8c550..3c67a8c550 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 426d7beb29..426d7beb29 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index f23ebc2c36..f23ebc2c36 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index d81e236b40..d81e236b40 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 045c201638..045c201638 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index 7be5566113..7be5566113 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index a6631f498e..a6631f498e 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index 7ed2d45c2f..7ed2d45c2f 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 24d2a16bc8..24d2a16bc8 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index 29c2af7513..29c2af7513 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 2fa9469b93..2fa9469b93 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index f17f31edb1..f17f31edb1 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index ed99239b19..ed99239b19 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index fcf9347564..fcf9347564 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9700e2bc60..9700e2bc60 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
index e8edb743a4..e8edb743a4 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
index ebad243c1c..ebad243c1c 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
index d0448356ef..d0448356ef 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
index 7aa6e518f4..7aa6e518f4 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 2ecddf5465..2ecddf5465 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 7714586951..7714586951 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
index da249a09e4..da249a09e4 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 3251ff37e1..3251ff37e1 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java.orig b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java.orig
index 2e86f1b4c5..2e86f1b4c5 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java.orig
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java.orig
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index cc3bb59a5b..cc3bb59a5b 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index f3555ee71e..f3555ee71e 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
index 13c622adf0..13c622adf0 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index c6facd2b02..c6facd2b02 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
index 9ae57c41d0..9ae57c41d0 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index bf175813f3..bf175813f3 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 77570aa13d..77570aa13d 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index de54d54f94..de54d54f94 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 2831bebbc4..2831bebbc4 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
index 74f0f2d71d..74f0f2d71d 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index 2394f4510b..2394f4510b 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 2d03381c8a..2d03381c8a 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 24aae45b59..24aae45b59 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index e183206894..e183206894 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index 5158eaf85c..5158eaf85c 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index ce2b4b13c3..ce2b4b13c3 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index 33399dcc2f..33399dcc2f 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index d7d8216f66..d7d8216f66 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index ecb774ac0c..ecb774ac0c 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 4bf29a3993..4bf29a3993 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index dcdb8733b8..dcdb8733b8 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 8bfdedf180..8bfdedf180 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index 1ab80e344b..1ab80e344b 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index fc0dc3aa99..fc0dc3aa99 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index 74f303a5a5..74f303a5a5 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index ff21c894de..ff21c894de 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 0660d69897..0660d69897 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
index 33c847a049..33c847a049 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
index 607725bcfe..607725bcfe 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-java-1.4/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/contribution-validation-messages.properties
index 4f9f85048e..4f9f85048e 100644
--- a/branches/sca-java-1.4/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-1.4/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-1.4/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/pom.xml
index 8eaa4ecbdc..8eaa4ecbdc 100644
--- a/branches/sca-java-1.4/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index 2056789089..2056789089 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index e182b472d4..e182b472d4 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 38ca2cd10c..38ca2cd10c 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 124928db24..124928db24 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
index 8733b91cd4..8733b91cd4 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
index 97629ea7b5..97629ea7b5 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index ff6e444dcd..ff6e444dcd 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 6e2e714bdb..6e2e714bdb 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index fb5f939edb..fb5f939edb 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 8d586905c4..8d586905c4 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 841efa9398..841efa9398 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index b41c7fb012..b41c7fb012 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 5814f3d215..5814f3d215 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 3586f54d71..3586f54d71 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index b0c39e18ef..b0c39e18ef 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
index 7d49fb7112..7d49fb7112 100644
--- a/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
diff --git a/branches/sca-java-1.4/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/LICENSE
diff --git a/branches/sca-java-1.4/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/NOTICE
diff --git a/branches/sca-java-1.4/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/pom.xml
index db702f6a8c..db702f6a8c 100644
--- a/branches/sca-java-1.4/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/pom.xml
diff --git a/branches/sca-java-1.4/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 5a0aefe55d..5a0aefe55d 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
index 2849c27c1a..2849c27c1a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
index 79a10f6d84..79a10f6d84 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
index fdd304a9c7..fdd304a9c7 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
index be55981131..be55981131 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 992c1188f7..992c1188f7 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index d17aebd7e8..d17aebd7e8 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index f209eb8936..f209eb8936 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index f888908340..f888908340 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 75719bb0cc..75719bb0cc 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 16cb4132e4..16cb4132e4 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index af8ad6e582..af8ad6e582 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 1edf612780..1edf612780 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 068d0d12d7..068d0d12d7 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
index f385c7dfba..f385c7dfba 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
index 183b38cb33..183b38cb33 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
index 3ea9d0ac3c..3ea9d0ac3c 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index bd0f4d4b75..bd0f4d4b75 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index b05130d6c8..b05130d6c8 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index a5d60cc6eb..a5d60cc6eb 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
index e23a37360a..e23a37360a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
index db38945fc1..db38945fc1 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
index fd748df6ca..fd748df6ca 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index f61bff9735..f61bff9735 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 44ae7f552a..44ae7f552a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index a2e7152202..a2e7152202 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 7d5cd6c54b..7d5cd6c54b 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24eaddd3e0..24eaddd3e0 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 4bc7facf39..4bc7facf39 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index c2346bddca..c2346bddca 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index b37519b31c..b37519b31c 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index b1beac78e2..b1beac78e2 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index ddd91bceac..ddd91bceac 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index 91839e998f..91839e998f 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 3a27569a3b..3a27569a3b 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
index 2425133273..2425133273 100644
--- a/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/LICENSE
diff --git a/branches/sca-java-1.4/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/NOTICE
diff --git a/branches/sca-java-1.4/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/core/pom.xml
index d76b1a25c4..d76b1a25c4 100644
--- a/branches/sca-java-1.4/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/pom.xml
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f51931c53b..f51931c53b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index 4f463b105d..4f463b105d 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index c82543c4ca..c82543c4ca 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 32ac611e54..32ac611e54 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index b386495a08..b386495a08 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index af5230a163..af5230a163 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index ad38906e9d..ad38906e9d 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index fc6d7abf6a..fc6d7abf6a 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..78b0887482 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 2bcf13f679..2bcf13f679 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index ed6c3df8fa..ed6c3df8fa 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 1d178421cf..1d178421cf 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 28e22b4f2c..28e22b4f2c 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 8a883f8e15..8a883f8e15 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..03c18c26b8 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 0bf66b2817..0bf66b2817 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 45eab7da1b..45eab7da1b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 4dc79c3844..4dc79c3844 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index d3106c7052..d3106c7052 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index 123400fbdd..123400fbdd 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 68cb5c2966..68cb5c2966 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 38a4fb10d6..38a4fb10d6 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index d7e797bbb9..d7e797bbb9 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 7530156b11..7530156b11 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..588c43b8b1 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 97c69c33cb..97c69c33cb 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..b5b40811ad 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 0fa1d27d2a..0fa1d27d2a 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 9acb4be6f8..9acb4be6f8 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..fcb48259b9 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index c559a42bdc..c559a42bdc 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index cade0499d3..cade0499d3 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index a23b9af9ad..a23b9af9ad 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index a2cbd1365b..a2cbd1365b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index ca2bf051c8..ca2bf051c8 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index d6911281c8..d6911281c8 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index a3c8429c7b..a3c8429c7b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index fc4bea3d9f..fc4bea3d9f 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..cb836e42c1 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 906628ee32..906628ee32 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
index 1112d02b7e..1112d02b7e 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 504bd9b036..504bd9b036 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1168d1d0dd..1168d1d0dd 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 3ae1ca51c5..3ae1ca51c5 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index adeb667277..adeb667277 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index ffc34e7328..ffc34e7328 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index fb47a65edf..fb47a65edf 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 67d2b66f84..67d2b66f84 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 170319b6e6..170319b6e6 100644
--- a/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5f54178483..5f54178483 100644
--- a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
index 898054509b..898054509b 100644
--- a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index af281d8f4d..af281d8f4d 100644
--- a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index bcbd5b0abf..bcbd5b0abf 100644
--- a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index b8150d4edc..b8150d4edc 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
index 3184c3de92..3184c3de92 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
index 91b45dfbcb..91b45dfbcb 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
index a7617f7a70..a7617f7a70 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
index 75840efef4..75840efef4 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
index 225f23cb93..225f23cb93 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
index ba32a92c18..ba32a92c18 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
index 715f5f95c0..715f5f95c0 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
index 3b30d86f14..3b30d86f14 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-1.4/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index ad23df3761..ad23df3761 100644
--- a/branches/sca-java-1.4/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-java-1.4/modules/data-api/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/data-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/LICENSE
diff --git a/branches/sca-java-1.4/modules/data-api/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/data-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/NOTICE
diff --git a/branches/sca-java-1.4/modules/data-api/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/pom.xml
index 6ceb69c037..6ceb69c037 100644
--- a/branches/sca-java-1.4/modules/data-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/pom.xml
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
index f559d5d914..f559d5d914 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
index 5903fd95a4..5903fd95a4 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
index 37042c0895..37042c0895 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
index c30bbc771a..c30bbc771a 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
index 69512058b7..69512058b7 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
index 7f13db5228..7f13db5228 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
index c2332ae2c9..c2332ae2c9 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
index a0d232a201..a0d232a201 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
index 77d8173521..77d8173521 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
index 757152725d..757152725d 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
index 047ab8829e..047ab8829e 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
index ed71471d9e..ed71471d9e 100644
--- a/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/LICENSE
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/NOTICE
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/pom.xml
index 81e621a0af..81e621a0af 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/pom.xml
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
index 99709857b8..99709857b8 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
index aef9ac3261..aef9ac3261 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
index 572c190037..572c190037 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
index a010e089e9..a010e089e9 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
index c72308f733..c72308f733 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
index df08a970b3..df08a970b3 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
diff --git a/branches/sca-java-1.4/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
index b040d69cc5..b040d69cc5 100644
--- a/branches/sca-java-1.4/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/pom.xml
index 2b275ab763..2b275ab763 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 142229f4f6..142229f4f6 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index cd820ab4b4..cd820ab4b4 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index 429a6dbe5d..429a6dbe5d 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index e23d89327c..e23d89327c 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 3dc73c89cb..3dc73c89cb 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index ef7359fbcd..ef7359fbcd 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index ea40e61746..ea40e61746 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index b2c004324c..b2c004324c 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 01e7003b20..01e7003b20 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 9084f09dc0..9084f09dc0 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 88d6b462c1..88d6b462c1 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 9eccd52d74..9eccd52d74 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 761185c297..761185c297 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 183270f9b4..183270f9b4 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f18f9638..a1f18f9638 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 7453cb787a..7453cb787a 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/pom.xml
index 871c5e3d1b..871c5e3d1b 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index 2e0aa629f3..2e0aa629f3 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 77f6b77636..77f6b77636 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index 73d549f4f8..73d549f4f8 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index 1c12a5dcad..1c12a5dcad 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b0d56b3bb6..b0d56b3bb6 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index d18206600c..d18206600c 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index bb8adf39be..bb8adf39be 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/pom.xml
index 179d80e534..179d80e534 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
index 93277e77bf..93277e77bf 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index c4726ad8fa..c4726ad8fa 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
index b6fa362ed9..b6fa362ed9 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index 3753fd9d64..3753fd9d64 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
index b7a395a623..b7a395a623 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
index 6fd65d4752..6fd65d4752 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
index 7702d099b4..7702d099b4 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
index 758a82f72f..758a82f72f 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
index 44e34c3647..44e34c3647 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
index a2a68c8eb0..a2a68c8eb0 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b48e629927..b48e629927 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
index 543a76594f..543a76594f 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
index 3c00307941..3c00307941 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/pom.xml
index cb8e288b8e..cb8e288b8e 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
index 57922e1c89..57922e1c89 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
index 91cb39b0f2..91cb39b0f2 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
index 003b4fb992..003b4fb992 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
index 062da48206..062da48206 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 3e262c7d12..3e262c7d12 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index eee5c77285..eee5c77285 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index 29951a5e16..29951a5e16 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index c64ce81fdf..c64ce81fdf 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 5265184ba6..5265184ba6 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 38efd288cb..38efd288cb 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
index 8805d72627..8805d72627 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index a60a882801..a60a882801 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
index f83c7f09d9..f83c7f09d9 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index a1f4c12c8f..a1f4c12c8f 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
index 5f90aa4d7a..5f90aa4d7a 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index e375a9b85e..e375a9b85e 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 840edfd234..840edfd234 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 5559690de8..5559690de8 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
index 5fa98b5ed1..5fa98b5ed1 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
index ad4bd04084..ad4bd04084 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index af3fa3fb66..af3fa3fb66 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 3f2978ad25..3f2978ad25 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e062e4c22..4e062e4c22 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
index d1f6d9f1e3..d1f6d9f1e3 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
index 602bc66569..602bc66569 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
index e2151e23a1..e2151e23a1 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 761414e92b..761414e92b 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index 5452175c54..5452175c54 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index 500422c9c7..500422c9c7 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
index 53779a1af6..53779a1af6 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index c10a5227ce..c10a5227ce 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
index 9bdfb108fe..9bdfb108fe 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
index b8e9ee7f7d..b8e9ee7f7d 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
index 5c511e6ccb..5c511e6ccb 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
index 3c3992524a..3c3992524a 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
index 62dfa6f73c..62dfa6f73c 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index fdfa87ff43..fdfa87ff43 100644
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-1.4/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-job/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-job/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-job/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.4/modules/databinding-job/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-job/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/pom.xml
index 6d717c6890..6d717c6890 100644
--- a/branches/sca-java-1.4/modules/databinding-job/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
index 98ca6c7429..98ca6c7429 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
index 9752815640..9752815640 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
index 9d3c6fac5a..9d3c6fac5a 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
index 40ee2ff010..40ee2ff010 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
index 8c98fd2e26..8c98fd2e26 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
index 5665e4f492..5665e4f492 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
index 693e0f1af7..693e0f1af7 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e9e7dc9d09..e9e7dc9d09 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index f42a526a48..f42a526a48 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xsd
index cce0cf1019..cce0cf1019 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/order.wsdl
index 913d9e4928..913d9e4928 100644
--- a/branches/sca-java-1.4/modules/databinding-job/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-job/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.4/modules/databinding-json/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.4/modules/databinding-json/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-json/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-json/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/pom.xml
index ce6853a216..ce6853a216 100644
--- a/branches/sca-java-1.4/modules/databinding-json/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index b1813c9eab..b1813c9eab 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4e08384f09..4e08384f09 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b70f772696..b70f772696 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 28cadc6666..28cadc6666 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index a928deef22..a928deef22 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index de023157bc..de023157bc 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index ff5968bccd..ff5968bccd 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index aa75afc9d4..aa75afc9d4 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index 1072b70029..1072b70029 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 400507296f..400507296f 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b122533f6e..b122533f6e 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 3c7f151ed7..3c7f151ed7 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.4/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/pom.xml
index 8d1b81473f..8d1b81473f 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 25f8ee886f..25f8ee886f 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
index 7122217b8b..7122217b8b 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index fabadd34ea..fabadd34ea 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index a5093f8cdf..a5093f8cdf 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
index 36ebac3aea..36ebac3aea 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1e5b816662..1e5b816662 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 616bcca6c5..616bcca6c5 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index ecb20b24b5..ecb20b24b5 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index ccf842710d..ccf842710d 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index 2f51cf86ec..2f51cf86ec 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 67d89a6e0b..67d89a6e0b 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
index 16d5f524bb..16d5f524bb 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index 7589f6789b..7589f6789b 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index 5da4effcfd..5da4effcfd 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
index 065121520b..065121520b 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e15021b972..e15021b972 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4d927ce53d..4d927ce53d 100644
--- a/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/pom.xml
index 50b4b8a597..50b4b8a597 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index aa7f99724d..aa7f99724d 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index a55a9f37cb..a55a9f37cb 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f69ef598b8..f69ef598b8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/pom.xml
index 2d696cfab0..2d696cfab0 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 503e54e530..503e54e530 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 8ce8eae587..8ce8eae587 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 116ac4c553..116ac4c553 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 115af19042..115af19042 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index 4a05492dd8..4a05492dd8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 695722be18..695722be18 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 0b58be9e41..0b58be9e41 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index c83ec53b01..c83ec53b01 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index c1978883df..c1978883df 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 8a1cd666d8..8a1cd666d8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 7ac423f8d8..7ac423f8d8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index 4e5aa1d5fd..4e5aa1d5fd 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index e70fa08477..e70fa08477 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index baf3e2e90a..baf3e2e90a 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index ac452910f6..ac452910f6 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 5ae557cc74..5ae557cc74 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 4bc41a5541..4bc41a5541 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 6a82a7fb18..6a82a7fb18 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index fa765f9bf4..fa765f9bf4 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 3c21b56c9f..3c21b56c9f 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 2aaae3c6d8..2aaae3c6d8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 11d8495de8..11d8495de8 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 114c568c38..114c568c38 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100755
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/pom.xml
index 6fe9ccfc42..6fe9ccfc42 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index e7b240b781..e7b240b781 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index 15616979c2..15616979c2 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
index 506c42e40f..506c42e40f 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index ca84f961b1..ca84f961b1 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index c820d9d250..c820d9d250 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index bbffb7d748..bbffb7d748 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ac76c6ca9b..ac76c6ca9b 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 7b98ddb021..7b98ddb021 100644
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100755
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/pom.xml
index 32259eb720..32259eb720 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
index 4c57cfe06b..4c57cfe06b 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
index d223a4db23..d223a4db23 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
index 2b7fa9d506..2b7fa9d506 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
index a465e92e65..a465e92e65 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
index d819975910..d819975910 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
index 21112efcf5..21112efcf5 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
index 98e0e69f9b..98e0e69f9b 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
index ff4305491a..ff4305491a 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
index b319c7d557..b319c7d557 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e2f467b8dd..e2f467b8dd 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a733ad7b7d..a733ad7b7d 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xml
index 1699538d62..1699538d62 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xsd
index aac7ded180..aac7ded180 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/order.wsdl
index 65da5b602a..65da5b602a 100644
--- a/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding-xstream/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.4/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/branches/sca-java-1.4/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/LICENSE
diff --git a/branches/sca-java-1.4/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/NOTICE
diff --git a/branches/sca-java-1.4/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/pom.xml
index ee1c92f900..ee1c92f900 100644
--- a/branches/sca-java-1.4/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/pom.xml
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 7c4ed35eb3..7c4ed35eb3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 2ff5d866b4..2ff5d866b4 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index e0860ff395..e0860ff395 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 7aa55d2cff..7aa55d2cff 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 6b8acfc7b4..6b8acfc7b4 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index 81264923eb..81264923eb 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 4e6d130aa9..4e6d130aa9 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 9ffadd1eae..9ffadd1eae 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 4f949f7dff..4f949f7dff 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a91410ed71..a91410ed71 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index e940f8675f..e940f8675f 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 6f3456fdf0..6f3456fdf0 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 04c2f0e0c9..04c2f0e0c9 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 94a2cdb0bb..94a2cdb0bb 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 64b3d22c10..64b3d22c10 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 01916dfb96..01916dfb96 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index cc7b40d06b..cc7b40d06b 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 70efd6a5c5..70efd6a5c5 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 45896ca6a1..45896ca6a1 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index b7ddf87a41..b7ddf87a41 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index c91176fc2c..c91176fc2c 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 32a2313f59..32a2313f59 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a6c0639411..a6c0639411 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index fb747864e7..fb747864e7 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 2f95c2a9c6..2f95c2a9c6 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 9615f43572..9615f43572 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 58f594751a..58f594751a 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 4942fef0da..4942fef0da 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index b96b394bb8..b96b394bb8 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index fb04014051..fb04014051 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 7ae64c6a27..7ae64c6a27 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 61a2189c72..61a2189c72 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 06feeffabd..06feeffabd 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index a723fd445c..a723fd445c 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index 1e39150f4a..1e39150f4a 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
index 34a82fd2d3..34a82fd2d3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 3423d3e3b0..3423d3e3b0 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index e029604722..e029604722 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 9e1ebb3522..9e1ebb3522 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 7f49a50e1e..7f49a50e1e 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 5f583da283..5f583da283 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index 39116ba4a1..39116ba4a1 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index e40c3006fb..e40c3006fb 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 3b7bd3088a..3b7bd3088a 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 5a31d9db91..5a31d9db91 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index fdc3c4139b..fdc3c4139b 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 5500d0bcca..5500d0bcca 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index 3c9022bc3c..3c9022bc3c 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 1b54b1fd1e..1b54b1fd1e 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index c9631595dc..c9631595dc 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 1e8d14a151..1e8d14a151 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 70387fa862..70387fa862 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 188ecaffa3..188ecaffa3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 38c61d64c8..38c61d64c8 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index cb9d538389..cb9d538389 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index d2625fba11..d2625fba11 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index e041f85214..e041f85214 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index ee9aa1bb76..ee9aa1bb76 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 8a2b6b39aa..8a2b6b39aa 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 2ed548ad76..2ed548ad76 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index ed57992910..ed57992910 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f8967e35b6..f8967e35b6 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 062e10cc45..062e10cc45 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index c56dba1843..c56dba1843 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index c2de202a9b..c2de202a9b 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index a7364006d0..a7364006d0 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index d73e495798..d73e495798 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 5ab7272d58..5ab7272d58 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index a7088eada3..a7088eada3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index f1084cf2a3..f1084cf2a3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index e2d0416aec..e2d0416aec 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 9b39f039b1..9b39f039b1 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 6db731bc9f..6db731bc9f 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 920ebb511c..920ebb511c 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 22b173dce5..22b173dce5 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 86ebd627f7..86ebd627f7 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 3dd125463e..3dd125463e 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f4bc357c7d..f4bc357c7d 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afb00c91ee..afb00c91ee 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 96115be404..96115be404 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index 8c710062ad..8c710062ad 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index f9e331fbf3..f9e331fbf3 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 562c22354c..562c22354c 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index 243ac71201..243ac71201 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 07ee0b0ca4..07ee0b0ca4 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index 15b9242340..15b9242340 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 7c882c0285..7c882c0285 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 053e4f2a59..053e4f2a59 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 6cc8868397..6cc8868397 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 31c3fd4f00..31c3fd4f00 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index dd3d000798..dd3d000798 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index bdc9690285..bdc9690285 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 9e9dabcea7..9e9dabcea7 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index f3b37c86db..f3b37c86db 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 3a287a5bb7..3a287a5bb7 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index cc1f9375c8..cc1f9375c8 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5ae0616577..5ae0616577 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 9ca490f2d8..9ca490f2d8 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index ff6f8c1406..ff6f8c1406 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index 0463e7d9f5..0463e7d9f5 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-1.4/modules/definitions-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/definitions-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/pom.xml
index f1a44e7ca6..f1a44e7ca6 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
index 0b760ef712..0b760ef712 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
index b87d890866..b87d890866 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 38fe3c5225..38fe3c5225 100644
--- a/branches/sca-java-1.4/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.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 4392461df1..4392461df1 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
index 857887ec3f..857887ec3f 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
index 187b7fa9f8..187b7fa9f8 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index ec4ead8b87..ec4ead8b87 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
index b4d7a8c584..b4d7a8c584 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index f60047e769..f60047e769 100644
--- a/branches/sca-java-1.4/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-java-1.4/modules/definitions/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/definitions/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/LICENSE
diff --git a/branches/sca-java-1.4/modules/definitions/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/definitions/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/NOTICE
diff --git a/branches/sca-java-1.4/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/pom.xml
index 7bf3f3f846..7bf3f3f846 100644
--- a/branches/sca-java-1.4/modules/definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/pom.xml
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
index 2039b9ecc9..2039b9ecc9 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
index a41d7a6717..a41d7a6717 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
index 85b9ad7f7d..85b9ad7f7d 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
index 8b9ff3e1a9..8b9ff3e1a9 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
index a5178497a0..a5178497a0 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
index 8de6f63c05..8de6f63c05 100644
--- a/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/domain-manager/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/LICENSE
diff --git a/branches/sca-java-1.4/modules/domain-manager/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/domain-manager/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/NOTICE
diff --git a/branches/sca-java-1.4/modules/domain-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/pom.xml
index 1c9098415b..1c9098415b 100644
--- a/branches/sca-java-1.4/modules/domain-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/pom.xml
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
index 0e25068f5f..0e25068f5f 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
index 09bb05cf87..09bb05cf87 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
index 9e024d2d6b..9e024d2d6b 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
index 0b304a0854..0b304a0854 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
index a4d7680cb0..a4d7680cb0 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
index e66a8b6684..e66a8b6684 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
index 14ab9579f4..14ab9579f4 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
index e95a0cc585..e95a0cc585 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
index 1831728f07..1831728f07 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
index a5ce6e12d6..a5ce6e12d6 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
index fee1efc37a..fee1efc37a 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
index a53250515a..a53250515a 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
index 2adb623876..2adb623876 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
index 06d28b0502..06d28b0502 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
index d68cfa3786..d68cfa3786 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
index 23c506446f..23c506446f 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
index f96e19ed72..f96e19ed72 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/DomainManager.composite
index ba57ea45d1..ba57ea45d1 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/DomainManager.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/DomainManager.composite
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud-gadget.html
index 619df54ede..619df54ede 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud.html
index d661d5d38b..d661d5d38b 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/cloud.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite-gadget.html
index 82855a410a..82855a410a 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite.html
index b0631e1d66..b0631e1d66 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/composite.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files-gadget.html
index 83315a1957..83315a1957 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files.html
index 37d89e7665..37d89e7665 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/files.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home-gadget.html
index 05e262e4df..05e262e4df 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home.html
index aad1856621..aad1856621 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/home.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/icons/feed-icon.png b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/icons/feed-icon.png
index a59728b2ad..a59728b2ad 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/icons/feed-icon.png
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/icons/feed-icon.png
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/manager.css b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/manager.css
index e080ff1d87..e080ff1d87 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/manager.css
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/manager.css
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/toolbar-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/toolbar-gadget.html
index c9389affc3..c9389affc3 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/toolbar-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/toolbar-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/utils.js b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/utils.js
index 77ed807e85..77ed807e85 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/utils.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/utils.js
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace-gadget.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace-gadget.html
index a4589b42e6..a4589b42e6 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace-gadget.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace-gadget.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace.html b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace.html
index 36c02ab1e6..36c02ab1e6 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/main/resources/workspace.html
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
index 5e76556a14..5e76556a14 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
index 4eab6dd5e7..4eab6dd5e7 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
index 48d4be2d6e..48d4be2d6e 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/workspace.xml b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/workspace.xml
index e6ac7d7701..e6ac7d7701 100644
--- a/branches/sca-java-1.4/modules/domain-manager/src/test/resources/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/domain-manager/src/test/resources/workspace.xml
diff --git a/branches/sca-java-1.4/modules/endpoint/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/endpoint/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/LICENSE
diff --git a/branches/sca-java-1.4/modules/endpoint/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/endpoint/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/NOTICE
diff --git a/branches/sca-java-1.4/modules/endpoint/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/pom.xml
index 91056e356a..91056e356a 100644
--- a/branches/sca-java-1.4/modules/endpoint/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/pom.xml
diff --git a/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
index f0646e934e..f0646e934e 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
index b76c4b82f0..b76c4b82f0 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 50e0a930d2..50e0a930d2 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.4/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
index 5a2d9babf4..5a2d9babf4 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
diff --git a/branches/sca-java-1.4/modules/endpoint/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/resources/Calculator.composite
index 3b743f6e26..3b743f6e26 100644
--- a/branches/sca-java-1.4/modules/endpoint/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/endpoint/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
index d3b956672d..d3b956672d 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 5ab5a66077..5ab5a66077 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 1cb1d09f8d..1cb1d09f8d 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
index 7602b02488..7602b02488 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index 3126365748..3126365748 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
index e000faa447..e000faa447 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
index b09efdf8ce..b09efdf8ce 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
index a536684b2e..a536684b2e 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
index 208ef1a74f..208ef1a74f 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
index aba7e62637..aba7e62637 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
diff --git a/branches/sca-java-1.4/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.4/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/pom.xml
index be3ed67921..be3ed67921 100644
--- a/branches/sca-java-1.4/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 48f240559c..48f240559c 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index 8ca030c0dd..8ca030c0dd 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 6f7c83c8d9..6f7c83c8d9 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index f2f67b2d52..f2f67b2d52 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index dbfd0dcd90..dbfd0dcd90 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index ec0f12b8ba..ec0f12b8ba 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index 6b14b95666..6b14b95666 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index da3a12732d..da3a12732d 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 403b6aa7a7..403b6aa7a7 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index 1722cd5f49..1722cd5f49 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index ce41a44068..ce41a44068 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 42bad63132..42bad63132 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index d769bad283..d769bad283 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index fd508402fc..fd508402fc 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/extension-helper/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/LICENSE
diff --git a/branches/sca-java-1.4/modules/extension-helper/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/extension-helper/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/NOTICE
diff --git a/branches/sca-java-1.4/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/pom.xml
index f90f752e7a..f90f752e7a 100644
--- a/branches/sca-java-1.4/modules/extension-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/pom.xml
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
index e117e952c7..e117e952c7 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
index 92b6e4191f..92b6e4191f 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
index 7d2a9c3d2d..7d2a9c3d2d 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
index c51a7267cc..c51a7267cc 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
index 8a83f630e9..8a83f630e9 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
index bca1dac0ed..bca1dac0ed 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
index 720d409a44..720d409a44 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
index f7c65acb3d..f7c65acb3d 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
index d156d835ad..d156d835ad 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
index de9a5bfbb1..de9a5bfbb1 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
index a59733aced..a59733aced 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
index c91618c24d..c91618c24d 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
index 112fb09f2a..112fb09f2a 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
index 0e658cfd1e..0e658cfd1e 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
index 9a521b5b79..9a521b5b79 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
index 550498d7b1..550498d7b1 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
index dbfb9d089f..dbfb9d089f 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
index f209825679..f209825679 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
index 4e7965ce60..4e7965ce60 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
diff --git a/branches/sca-java-1.4/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a408b0d061..a408b0d061 100644
--- a/branches/sca-java-1.4/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/pom.xml
index e0d35a1a34..e0d35a1a34 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
index b5fe9f5d0f..b5fe9f5d0f 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
index 7e714c1ca5..7e714c1ca5 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3762550c01..3762550c01 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
index fd952a02c7..fd952a02c7 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
index a0b9b7c514..a0b9b7c514 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
index f480235fa8..f480235fa8 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
index f9f3d4789e..f9f3d4789e 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
index 9ed4c81248..9ed4c81248 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
index 357c1eddb0..357c1eddb0 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
index c2d4877791..c2d4877791 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
index 9846748775..9846748775 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
index cd722214ed..cd722214ed 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
index 6195f3af9c..6195f3af9c 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/resources/general.idl
index 9194a37334..9194a37334 100644
--- a/branches/sca-java-1.4/modules/host-corba-jee/src/test/resources/general.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jee/src/test/resources/general.idl
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/pom.xml
index 5a5ca72ab7..5a5ca72ab7 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
index 312d739c53..312d739c53 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
index 2dc2c7ddd4..2dc2c7ddd4 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 906ec4efce..906ec4efce 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
index 9f6be0f27d..9f6be0f27d 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/pom.xml
index e5302af5cc..e5302af5cc 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
index 252a1512e4..252a1512e4 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index 015644e19d..015644e19d 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
index 59f0ce9a53..59f0ce9a53 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
index 599f5bca54..599f5bca54 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 77617a6c5c..77617a6c5c 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
index a7164e9ef3..a7164e9ef3 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
index 444143f173..444143f173 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a96baed33e..a96baed33e 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 8084e39956..8084e39956 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
index 8d1a9db9e9..8d1a9db9e9 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
index fe85dc7743..fe85dc7743 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
index 305a4d7b97..305a4d7b97 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
index f557d3e020..f557d3e020 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
index f993066dab..f993066dab 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
index 30a77deaf5..30a77deaf5 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
index 0ebde8ef0d..0ebde8ef0d 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-java-1.4/modules/host-corba-jse/src/test/resources/general.idl b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/resources/general.idl
index f67566deb8..f67566deb8 100644
--- a/branches/sca-java-1.4/modules/host-corba-jse/src/test/resources/general.idl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba-jse/src/test/resources/general.idl
diff --git a/branches/sca-java-1.4/modules/host-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/host-corba/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/host-corba/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/pom.xml
index 2de89d29a6..2de89d29a6 100644
--- a/branches/sca-java-1.4/modules/host-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index eb49f3f841..eb49f3f841 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
index 049bfdb6cd..049bfdb6cd 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
index 067b9193c5..067b9193c5 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
index b90fe9c78b..b90fe9c78b 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
index a380fd6d79..a380fd6d79 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
index 438734086d..438734086d 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 7e043667a9..7e043667a9 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
index 6989b3ad06..6989b3ad06 100755
--- a/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
diff --git a/branches/sca-java-1.4/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
index a72bed4ea8..a72bed4ea8 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
diff --git a/branches/sca-java-1.4/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
index 4e076f9342..4e076f9342 100644
--- a/branches/sca-java-1.4/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/pom.xml
index 25956ce839..25956ce839 100644
--- a/branches/sca-java-1.4/modules/host-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
index c0107cb316..c0107cb316 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
index 842dd7a4f5..842dd7a4f5 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
index 75912dcc45..75912dcc45 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
index a50e701766..a50e701766 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
index f9967bdd8a..f9967bdd8a 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
index fab408c7c0..fab408c7c0 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
diff --git a/branches/sca-java-1.4/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
index c42791f598..c42791f598 100644
--- a/branches/sca-java-1.4/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
diff --git a/branches/sca-java-1.4/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/pom.xml
index 24326e940b..24326e940b 100644
--- a/branches/sca-java-1.4/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index bb8b8ad0e0..bb8b8ad0e0 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index c9bfe499c6..c9bfe499c6 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index 7c893a5c9e..7c893a5c9e 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index 187f32f405..187f32f405 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 1bca290c27..1bca290c27 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 519e76d0ae..519e76d0ae 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index d59f1544e5..d59f1544e5 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 55b6afb6f2..55b6afb6f2 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index 738e5e6248..738e5e6248 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 5f38c0c063..5f38c0c063 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index 4acb270810..4acb270810 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 9252b114a1..9252b114a1 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index c52c16d8e1..c52c16d8e1 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
index 8b0bd5fd73..8b0bd5fd73 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index fd5398c8e6..fd5398c8e6 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 2a59635a19..2a59635a19 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 1cfe5ed5d8..1cfe5ed5d8 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index d9f1228307..d9f1228307 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
index 083b01167f..083b01167f 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
index 73feffad50..73feffad50 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
index f6f077e99b..f6f077e99b 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
index 1d27e08fee..1d27e08fee 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
index 15d3618fdd..15d3618fdd 100644
--- a/branches/sca-java-1.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/sample/Helloworld.java
index 386426df73..386426df73 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/java/sample/Helloworld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/java/sample/Helloworld.java
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.jar b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.jar
index 0e022a3e2c..0e022a3e2c 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.jar
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.zip b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.zip
index 0e022a3e2c..0e022a3e2c 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.zip
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/helloworld.zip
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.composite
index bd7c5fab79..bd7c5fab79 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-1.4/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/pom.xml
index 9190e453be..9190e453be 100644
--- a/branches/sca-java-1.4/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index 3de0b9f5a7..3de0b9f5a7 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 5e6de0b29b..5e6de0b29b 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 4be5de4100..4be5de4100 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index e5dbd59a07..e5dbd59a07 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index fbd085ba2b..fbd085ba2b 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index ae66c44c3e..ae66c44c3e 100644
--- a/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-java-1.4/modules/host-jetty/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-jetty/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-jetty/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-jetty/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-jetty/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/pom.xml
index 9bbcb165b2..9bbcb165b2 100644
--- a/branches/sca-java-1.4/modules/host-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index 4f5bfb3c62..4f5bfb3c62 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index dfb34f11a5..dfb34f11a5 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
index 884c8a4cce..884c8a4cce 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..f61708de90 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index 020dd4af0e..020dd4af0e 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.4/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/branches/sca-java-1.4/modules/host-jetty/src/test/resources/tuscany.keyStore
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-jetty/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-java-1.4/modules/host-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.4/modules/host-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/branches/sca-java-1.4/modules/host-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/pom.xml
index b3b12cb285..b3b12cb285 100644
--- a/branches/sca-java-1.4/modules/host-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8bab603184..8bab603184 100644
--- a/branches/sca-java-1.4/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/pom.xml
index 869305da7e..869305da7e 100644
--- a/branches/sca-java-1.4/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index 8985c508fc..8985c508fc 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 3ac086a2ee..3ac086a2ee 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 32fe6c2deb..32fe6c2deb 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index 59377de22a..59377de22a 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 959eb72f6e..959eb72f6e 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 40d6013940..40d6013940 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index 998287f998..998287f998 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-java-1.4/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index 04d4d0f3cb..04d4d0f3cb 100644
--- a/branches/sca-java-1.4/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/pom.xml
index dc0dbb3e02..dc0dbb3e02 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index a0b384d554..a0b384d554 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 5d9b65503a..5d9b65503a 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index 5ea1701c05..5ea1701c05 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 070dffdce6..070dffdce6 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index afbec52cd9..afbec52cd9 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/tuscany.keyStore b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/tuscany.keyStore
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-tomcat/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-java-1.4/modules/host-webapp-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/host-webapp-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-webapp-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/host-webapp-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-webapp-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/pom.xml
index acdea63d5e..acdea63d5e 100644
--- a/branches/sca-java-1.4/modules/host-webapp-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp-junit/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index b2d3d0abf1..b2d3d0abf1 100644
--- a/branches/sca-java-1.4/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.4/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/branches/sca-java-1.4/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.4/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index 72ec478cd6..72ec478cd6 100644
--- a/branches/sca-java-1.4/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.4/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/LICENSE
index 0085d7e5ee..0085d7e5ee 100644
--- a/branches/sca-java-1.4/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-1.4/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/NOTICE
index c73281e470..c73281e470 100644
--- a/branches/sca-java-1.4/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-1.4/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/pom.xml
index cadc0a673d..cadc0a673d 100644
--- a/branches/sca-java-1.4/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
index d7ff73e31f..d7ff73e31f 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
index 2dbd7e9aa1..2dbd7e9aa1 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index 593073b068..593073b068 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
index 559fef73cc..559fef73cc 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index a5a3745d7f..a5a3745d7f 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
index dbe8a523f9..dbe8a523f9 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
index f14dfac58b..f14dfac58b 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 599afc541c..599afc541c 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
index be35733220..be35733220 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
index 6e1b187a48..6e1b187a48 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
index b7eb93222e..b7eb93222e 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/sca.tld b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/sca.tld
index 91ee6cb922..91ee6cb922 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/sca.tld
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/sca.tld
diff --git a/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d99fdf257e..d99fdf257e 100644
--- a/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/LICENSE
index baba9ca048..baba9ca048 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/NOTICE
index a2f696be26..a2f696be26 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml
index 876b7bff9e..876b7bff9e 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
index 0b0cd98a66..0b0cd98a66 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index 84c40defd9..84c40defd9 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index 11af0f8b50..11af0f8b50 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 3f2db7b244..3f2db7b244 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index a6428f6984..a6428f6984 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
index 15e9229601..15e9229601 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index 1ec82390cf..1ec82390cf 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
index 328403e626..328403e626 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
index 8f8f608217..8f8f608217 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index 22a86a9e0f..22a86a9e0f 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index c644b6a965..c644b6a965 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
index c5d6555a24..c5d6555a24 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index f301082d59..f301082d59 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 3bce8aa9ab..3bce8aa9ab 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
index 360df0b2c5..360df0b2c5 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
index bcd3ea6afa..bcd3ea6afa 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/log4j.properties
index 82b3c09723..82b3c09723 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/NOTICE
index a2f696be26..a2f696be26 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/pom.xml
index ea5e9bc7aa..ea5e9bc7aa 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index 9f8f9c0e9a..9f8f9c0e9a 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index d54add5391..d54add5391 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index a6518ed11b..a6518ed11b 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
index ab53964fb3..ab53964fb3 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index f1c943e49c..f1c943e49c 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 5ce4f91376..5ce4f91376 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index cde6fc4fc5..cde6fc4fc5 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index ce1c22e641..ce1c22e641 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
index bf0020323c..bf0020323c 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
index b7f5d1d3f2..b7f5d1d3f2 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
index fdaf98a97f..fdaf98a97f 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 03ef3e3a7f..03ef3e3a7f 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f6fd442f56..f6fd442f56 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 4276e938f1..4276e938f1 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
index b6d8bdc0f1..b6d8bdc0f1 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index e355b7adf9..e355b7adf9 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 9dd5306de1..9dd5306de1 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/pom.xml
index 9780c91402..9780c91402 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
index 0d3b05f0c9..0d3b05f0c9 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
index bf9e13069b..bf9e13069b 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
index 050d0cf17a..050d0cf17a 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
index c9bfaea00b..c9bfaea00b 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index b3e5e3394c..b3e5e3394c 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ae6db609a2..ae6db609a2 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
index 4eaf2b9007..4eaf2b9007 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
index b692ab3f5a..b692ab3f5a 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
index 8ba43dd635..8ba43dd635 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
index 0c1368c4dd..0c1368c4dd 100644
--- a/branches/sca-java-1.4/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/branches/sca-java-1.4/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/pom.xml
index 8eff9e0393..8eff9e0393 100644
--- a/branches/sca-java-1.4/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index ffce7ce467..ffce7ce467 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 695dea3343..695dea3343 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index ef4e67d79a..ef4e67d79a 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index e585b3d46f..e585b3d46f 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 25d538cff4..25d538cff4 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index e9eea607c9..e9eea607c9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 9b78439012..9b78439012 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 95a9f63688..95a9f63688 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ee3507ef80..ee3507ef80 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 8c85b46c65..8c85b46c65 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 31c91e2d6c..31c91e2d6c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
index d502462688..d502462688 100644
--- a/branches/sca-java-1.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 82264c77c9..82264c77c9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index ed6bf7ddc4..ed6bf7ddc4 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/pom.xml
index 6f2b0793b6..6f2b0793b6 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index ecbf0c4c78..ecbf0c4c78 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 11934ec6bb..11934ec6bb 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
index 210b715da8..210b715da8 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..3f28d740a7 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index e5912906f5..e5912906f5 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 27e3579c35..27e3579c35 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 646b5db617..646b5db617 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 9147133d5d..9147133d5d 100644
--- a/branches/sca-java-1.4/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.4/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.4/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/pom.xml
index c0e9d066b2..c0e9d066b2 100644
--- a/branches/sca-java-1.4/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index e44ebd7c91..e44ebd7c91 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 2ad7edbd6f..2ad7edbd6f 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 97773879fa..97773879fa 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 0bcec3c78f..0bcec3c78f 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index 2365298f71..2365298f71 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
index 46594e0f50..46594e0f50 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 0cc78498e6..0cc78498e6 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 375896cf26..375896cf26 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4fa40dee4b..4fa40dee4b 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 17e28479d3..17e28479d3 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 985f8baa82..985f8baa82 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index efd04262dd..efd04262dd 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 50e4d46e97..50e4d46e97 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index b7f6748ed2..b7f6748ed2 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 9fe2fcd468..9fe2fcd468 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 583ccc86cd..583ccc86cd 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 6039bd91f8..6039bd91f8 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 954a3abbc8..954a3abbc8 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 6854acdc2a..6854acdc2a 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-1.4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index df60d57cf9..df60d57cf9 100644
--- a/branches/sca-java-1.4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index c6b2626e9c..c6b2626e9c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index ffc67325fa..ffc67325fa 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ff267cd938..ff267cd938 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index ed0527d3d7..ed0527d3d7 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 70c615ca24..70c615ca24 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 4a625982b0..4a625982b0 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 10f0500e4d..10f0500e4d 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index aea90aa6eb..aea90aa6eb 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/pom.xml
index fd6423379a..fd6423379a 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
index 90b71223b4..90b71223b4 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
index 331c53a596..331c53a596 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
index b82571dc58..b82571dc58 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
index 8492befda5..8492befda5 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
index 984cd1a5fa..984cd1a5fa 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06b5f2198b..06b5f2198b 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
index dcdfb7dfb5..dcdfb7dfb5 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
index 221d077a33..221d077a33 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
index 78849cd22f..78849cd22f 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
index ac85b888c4..ac85b888c4 100644
--- a/branches/sca-java-1.4/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/pom.xml
index ed39eccc99..ed39eccc99 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index 8de2a3a3f9..8de2a3a3f9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 0264574fb9..0264574fb9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index 62a822a85e..62a822a85e 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index f6a601a3cd..f6a601a3cd 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index 5a50f87d4c..5a50f87d4c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index 73475f49fe..73475f49fe 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index d4dc62a42d..d4dc62a42d 100644
--- a/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-java-1.4/modules/implementation-node/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-node/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/pom.xml
index ea613a1830..ea613a1830 100644
--- a/branches/sca-java-1.4/modules/implementation-node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d4755f4071..d4755f4071 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index 527698ea91..527698ea91 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
index 736afc13f0..736afc13f0 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index 1d183513b4..1d183513b4 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index 8f6315d969..8f6315d969 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index e695340d45..e695340d45 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index 201354f89c..201354f89c 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9378db0875..9378db0875 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
index 1dc397659b..1dc397659b 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index bc0c3b1507..bc0c3b1507 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index c5e6a40f89..c5e6a40f89 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index 92787d3ac1..92787d3ac1 100644
--- a/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-java-1.4/modules/implementation-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/pom.xml
index 310ccfde37..310ccfde37 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
index 3f79ca71e5..3f79ca71e5 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
index f5889e9679..f5889e9679 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
index a2e35c5cb6..a2e35c5cb6 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
index cea7038e9c..cea7038e9c 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
index 594bec75b5..594bec75b5 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
index c8b55c7caa..c8b55c7caa 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
index e9ea71c1d5..e9ea71c1d5 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
index 80785e36e7..80785e36e7 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
index 2795619208..2795619208 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f8f6975395..f8f6975395 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
index f9a20edccd..f9a20edccd 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
index 89cbd3ec48..89cbd3ec48 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
index 1fd952a0a8..1fd952a0a8 100644
--- a/branches/sca-java-1.4/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/README b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/README
index ff6ee6a8f4..ff6ee6a8f4 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/README
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/README
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/pom.xml
index 91a2961a73..91a2961a73 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
index c1ed6b4e58..c1ed6b4e58 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
index a5812b26e4..a5812b26e4 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
index 7ddd30047a..7ddd30047a 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
index d6e8276f25..d6e8276f25 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
index c4b14a1a90..c4b14a1a90 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
index f5972142de..f5972142de 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
index 820121824a..820121824a 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
index 2fb35f83a1..2fb35f83a1 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
index 441ba666d7..441ba666d7 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
index 2a7d1abd70..2a7d1abd70 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
index 055ecd4a4d..055ecd4a4d 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
index fbff09341c..fbff09341c 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
index 11a92c5064..11a92c5064 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
index 8b74209d3e..8b74209d3e 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3f8e373c88..3f8e373c88 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
index 13067543c9..13067543c9 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index fb62ff853b..fb62ff853b 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java
index 900fab3242..900fab3242 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Abc.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Abc.java
index 0f8e9e4391..0f8e9e4391 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Abc.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Abc.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Message.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Message.java
index da4fd1f3fc..da4fd1f3fc 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Message.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/Message.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/MyObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/MyObject.java
index d3b1baf182..d3b1baf182 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/MyObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/java/sample/MyObject.java
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/resources/openjpa.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/resources/openjpa.composite
index 1c1b6976bd..1c1b6976bd 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/src/test/resources/openjpa.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/src/test/resources/openjpa.composite
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/db.lck b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/db.lck
index ad9dc5455d..ad9dc5455d 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/db.lck
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/db.lck
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log.ctrl b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log.ctrl
index 9ce366fcb9..9ce366fcb9 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log.ctrl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log.ctrl
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log1.dat
index cc35dfe190..cc35dfe190 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/log1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/logmirror.ctrl b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/logmirror.ctrl
index 9ce366fcb9..9ce366fcb9 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/log/logmirror.ctrl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/log/logmirror.ctrl
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c10.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c10.dat
index 7a0801a048..7a0801a048 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c10.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c10.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c101.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c101.dat
index bf3e68815c..bf3e68815c 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c101.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c101.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c111.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c111.dat
index 1e0cedeb01..1e0cedeb01 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c111.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c111.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c121.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c121.dat
index c8dfb77f24..c8dfb77f24 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c121.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c121.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c130.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c130.dat
index 2b7138c98d..2b7138c98d 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c130.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c130.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c141.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c141.dat
index 52d555910b..52d555910b 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c141.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c141.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c150.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c150.dat
index 29e11535cb..29e11535cb 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c150.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c150.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c161.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c161.dat
index 4cb160cf7c..4cb160cf7c 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c161.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c161.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c171.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c171.dat
index 0a335bfa96..0a335bfa96 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c171.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c171.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c180.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c180.dat
index 30fc7aa23b..30fc7aa23b 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c180.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c180.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c191.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c191.dat
index b2d149a0f3..b2d149a0f3 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c191.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c191.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1a1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1a1.dat
index a0153570e1..a0153570e1 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1a1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1a1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1b1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1b1.dat
index 396dc810ae..396dc810ae 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1b1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1b1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1c0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1c0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1c0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1d1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1d1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1d1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1e0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1e0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1e0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1f1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1f1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c1f1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c20.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c20.dat
index 0aa098f1ca..0aa098f1ca 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c20.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c20.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c200.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c200.dat
index cae919d022..cae919d022 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c200.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c200.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c211.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c211.dat
index c7e311b00e..c7e311b00e 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c211.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c211.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c221.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c221.dat
index 28e89367ce..28e89367ce 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c221.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c221.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c230.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c230.dat
index 528295a863..528295a863 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c230.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c230.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c241.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c241.dat
index 5c8f825ad8..5c8f825ad8 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c241.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c241.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c251.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c251.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c251.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c260.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c260.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c260.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c271.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c271.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c271.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c281.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c281.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c281.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c290.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c290.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c290.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2a1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2a1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2a1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2b1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2b1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2b1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2c1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2c1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2c1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2d0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2d0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2d0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2e1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2e1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2e1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2f0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2f0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c2f0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c300.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c300.dat
index cb474d9335..cb474d9335 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c300.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c300.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c31.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c31.dat
index ce609b1bb3..ce609b1bb3 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c31.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c31.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c311.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c311.dat
index 5ad39aaab4..5ad39aaab4 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c311.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c311.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c320.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c320.dat
index 1aacbe9fac..1aacbe9fac 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c320.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c320.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c331.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c331.dat
index bb7a47c150..bb7a47c150 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c331.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c331.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c41.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c41.dat
index 3c730d1420..3c730d1420 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c41.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c41.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c51.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c51.dat
index 9c861dbc56..9c861dbc56 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c51.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c51.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c60.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c60.dat
index 8165cc700e..8165cc700e 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c60.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c60.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c71.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c71.dat
index 1696647e11..1696647e11 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c71.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c71.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c81.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c81.dat
index cfe999e650..cfe999e650 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c81.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c81.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c90.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c90.dat
index 0bfa562d41..0bfa562d41 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c90.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/c90.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ca1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ca1.dat
index 188373cb62..188373cb62 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ca1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ca1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cb1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cb1.dat
index ced876c84f..ced876c84f 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cb1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cb1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cc0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cc0.dat
index 5126021a83..5126021a83 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cc0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cc0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cd1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cd1.dat
index 2e135b64ab..2e135b64ab 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cd1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cd1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ce1.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ce1.dat
index 076423c10a..076423c10a 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ce1.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/ce1.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cf0.dat b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cf0.dat
index 1a9a838ddf..1a9a838ddf 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cf0.dat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/seg0/cf0.dat
diff --git a/branches/sca-java-1.4/modules/implementation-openjpa/test/service.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/service.properties
index ae366e6ef7..ae366e6ef7 100644
--- a/branches/sca-java-1.4/modules/implementation-openjpa/test/service.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-openjpa/test/service.properties
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/pom.xml
index eb54328371..eb54328371 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 7bcb0a1da5..7bcb0a1da5 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
index 33c790585c..33c790585c 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
index 0264f0b102..0264f0b102 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index 38befa611b..38befa611b 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index fe3efd22cd..fe3efd22cd 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 5664c77618..5664c77618 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
index 814d37f203..814d37f203 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
index e775041592..e775041592 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
index deb44d26fb..deb44d26fb 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
index deb39a47cd..deb39a47cd 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 7f246cb76c..7f246cb76c 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ecff71874..9ecff71874 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index c2cd957351..c2cd957351 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
index 2503be0b13..2503be0b13 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
index fb4cb4207a..fb4cb4207a 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
index 6a6d80f15e..6a6d80f15e 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index 93b4dee033..93b4dee033 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index d412f6bd6a..d412f6bd6a 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index feb9ce177e..feb9ce177e 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index 630c1502d1..630c1502d1 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 1831587896..1831587896 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index e1bbd97655..e1bbd97655 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 0b31145407..0b31145407 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5465eec8d9..5465eec8d9 100644
--- a/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/pom.xml
index 5e51a6f37e..5e51a6f37e 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
index 582795625d..582795625d 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index a974f68a7e..a974f68a7e 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index 47e70b5581..47e70b5581 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index 03f10e78e8..03f10e78e8 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource-runtime/src/test/resources/resource.composite
diff --git a/branches/sca-java-1.4/modules/implementation-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/pom.xml
index 173fae3e0d..173fae3e0d 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index 68219de701..68219de701 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index be136ee792..be136ee792 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index d4db8772e4..d4db8772e4 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index 9cad0890a3..9cad0890a3 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index 6abef37b1a..6abef37b1a 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
index 7f619ef036..7f619ef036 100644
--- a/branches/sca-java-1.4/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.4/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/NOTICE
index 5782e5ee9b..5782e5ee9b 100644
--- a/branches/sca-java-1.4/modules/implementation-script/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/pom.xml
index 695ccec4d7..695ccec4d7 100644
--- a/branches/sca-java-1.4/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 87820c18ed..87820c18ed 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
index a7c4b9074f..a7c4b9074f 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
index 2ccb414be8..2ccb414be8 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
index 9359590424..9359590424 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index 324246c32b..324246c32b 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
diff --git a/branches/sca-java-1.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index fc87f92ef1..fc87f92ef1 100644
--- a/branches/sca-java-1.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
index 09239cd38f..09239cd38f 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
index 5781f4f2c9..5781f4f2c9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
index e88e44c7c0..e88e44c7c0 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
index 331d5bcfd4..331d5bcfd4 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index 1af3a295a4..1af3a295a4 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 6a4f10dbbb..6a4f10dbbb 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index f87cf104f3..f87cf104f3 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 980864869f..980864869f 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index ca4bd5ae6a..ca4bd5ae6a 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
index 93d1949c50..93d1949c50 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 46ed9abce6..46ed9abce6 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index d694515829..d694515829 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index e7375253a3..e7375253a3 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index f93edc76d1..f93edc76d1 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 910d22ec83..910d22ec83 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index 47cdc03e0e..47cdc03e0e 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 60c73359c0..60c73359c0 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index cde96b4b9b..cde96b4b9b 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index 0e6be74e09..0e6be74e09 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 6116581356..6116581356 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index dfcd37c46c..dfcd37c46c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 83c2e99469..83c2e99469 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 392e16411c..392e16411c 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 8866ae6b70..8866ae6b70 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-1.4/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/pom.xml
index a233e949ed..a233e949ed 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
index b550fc3229..b550fc3229 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
index 32f575fe46..32f575fe46 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
index d419d6db68..d419d6db68 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
index 45f00ce1af..45f00ce1af 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
index dc532ce20d..dc532ce20d 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
index 1dd44cd752..1dd44cd752 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
index 9dadcd2f49..9dadcd2f49 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index 35df76fabc..35df76fabc 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index e4f62d3bb2..e4f62d3bb2 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index 546006e504..546006e504 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
index 4717df2056..4717df2056 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
index 1789b5a4e0..1789b5a4e0 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
index 410525a054..410525a054 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
index 5eeb802727..5eeb802727 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
index b34b1ee0b1..b34b1ee0b1 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
index 3f98180498..3f98180498 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index cd0567f461..cd0567f461 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 4dadf37189..4dadf37189 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 44737bf9d1..44737bf9d1 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index d8755c58f4..d8755c58f4 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index 52f8ac3684..52f8ac3684 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
index 92f980fdfe..92f980fdfe 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index f9a9fee58f..f9a9fee58f 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index 3e526cd20e..3e526cd20e 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
index 57f4a26ba3..57f4a26ba3 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index 39e1286f32..39e1286f32 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index 2f37ab6504..2f37ab6504 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig
index 19874ad35d..19874ad35d 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index b3f45415fd..b3f45415fd 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 2eb5686270..2eb5686270 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index 214faf7198..214faf7198 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ab707cfd68..ab707cfd68 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index 7f9a7b17b0..7f9a7b17b0 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 6fce02664a..6fce02664a 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index 6b2d114756..6b2d114756 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index c9b30b1688..c9b30b1688 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index fd295daaf6..fd295daaf6 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 65ab096855..65ab096855 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index bd35e9f3b9..bd35e9f3b9 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
index d77f183a66..d77f183a66 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 86f979fe15..86f979fe15 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 44016ad249..44016ad249 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 74dcf32723..74dcf32723 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 97f91ff91e..97f91ff91e 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
index bfe3d64cf3..bfe3d64cf3 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 2c46f8c066..2c46f8c066 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 4d60bffef8..4d60bffef8 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index acad9f2fea..acad9f2fea 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
index 79de2b32a0..79de2b32a0 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f165bb8b75..f165bb8b75 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index a1d9b5a2f4..a1d9b5a2f4 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index ab4c07d059..ab4c07d059 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0f00c7e480..0f00c7e480 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
index a7d30bf201..a7d30bf201 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 7c358ac01c..7c358ac01c 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index 38e90b41fa..38e90b41fa 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index e6b69e8cad..e6b69e8cad 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
index 8e18a56cca..8e18a56cca 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
index fdbbeeced2..fdbbeeced2 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
index 6b3f1f9890..6b3f1f9890 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
index 0b260b5dcf..0b260b5dcf 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
index 95dd9131eb..95dd9131eb 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
diff --git a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index af1b3be0a5..af1b3be0a5 100644
--- a/branches/sca-java-1.4/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.4/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
index f1ee21686d..f1ee21686d 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/test.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/test.xml
index f2d684f766..f2d684f766 100644
--- a/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/test.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-spring/src/test/resources/test.xml
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/pom.xml
index cfd856b2ff..cfd856b2ff 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index d9616de359..d9616de359 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 61176d912c..61176d912c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index c57680fa1c..c57680fa1c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
index c7093042d6..c7093042d6 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/atomModel.js b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/atomModel.js
index c64c3fc97c..c64c3fc97c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/atomModel.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/atomModel.js
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-atom.js b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
index 2719e9a9b9..2719e9a9b9 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-http.js
index 60bd841679..60bd841679 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-http.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-http.js
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index 3b5c6f89b2..3b5c6f89b2 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
index 370474f29f..370474f29f 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
index bed053eeee..bed053eeee 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
index 37e8d0161a..37e8d0161a 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
index c64c3fc97c..c64c3fc97c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/store.html b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/store.html
index 58f9f560a7..58f9f560a7 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/store.html
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
index 6bbc285377..6bbc285377 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
index 352dd85508..352dd85508 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widget.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widget.composite
diff --git a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
index e44a56e520..e44a56e520 100644
--- a/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
diff --git a/branches/sca-java-1.4/modules/implementation-widget/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-widget/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-widget/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/pom.xml
index 485fe923f7..485fe923f7 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index f47850a05c..f47850a05c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index b35cc41dd4..b35cc41dd4 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index 2493b97f5c..2493b97f5c 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index abe00bac5b..abe00bac5b 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index bd91dd7632..bd91dd7632 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/branches/sca-java-1.4/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
index 3778bd4c50..3778bd4c50 100644
--- a/branches/sca-java-1.4/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/LICENSE
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/NOTICE
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/pom.xml
index d4dba73821..d4dba73821 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
index f5bc5dd9b8..f5bc5dd9b8 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
index bdfd390499..bdfd390499 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
index 63a3a49e13..63a3a49e13 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
index 57536e502b..57536e502b 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
index 0c628b3715..0c628b3715 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
index 2a9673068b..2a9673068b 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 5e77575c3c..5e77575c3c 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
index 77c8eea511..77c8eea511 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
index 9adce78310..9adce78310 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
index d1e74dd40d..d1e74dd40d 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 7ccc08d1ee..7ccc08d1ee 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
index 33c605de27..33c605de27 100644
--- a/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/pom.xml
index 5700086ef0..5700086ef0 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
index 4cf56fed0c..4cf56fed0c 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
index b05715b54e..b05715b54e 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
index 40fbefa3ed..40fbefa3ed 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
index f36dd3a443..f36dd3a443 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
index c3f568ef48..c3f568ef48 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index 0cd6286c87..0cd6286c87 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index d1b36fa17c..d1b36fa17c 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
index 764c10ff00..764c10ff00 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 1b07e25bad..1b07e25bad 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index d38a21ba52..d38a21ba52 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7b9375063d..7b9375063d 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
index 567591f166..567591f166 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 108d283584..108d283584 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
index b3c7102a78..b3c7102a78 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
index 4df0517de6..4df0517de6 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 78527193d5..78527193d5 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
index 2ecf822904..2ecf822904 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
index a6a3375eff..a6a3375eff 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
index b14ef19939..b14ef19939 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
index 882408ade6..882408ade6 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 4fee9e9756..4fee9e9756 100644
--- a/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/pom.xml
index 0496e03b32..0496e03b32 100644
--- a/branches/sca-java-1.4/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 5d2d8ed51c..5d2d8ed51c 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index ae5bf4c56d..ae5bf4c56d 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
index bc0a7192b5..bc0a7192b5 100644
--- a/branches/sca-java-1.4/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 313f950873..313f950873 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 55fc12d176..55fc12d176 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.4/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/pom.xml
index 3547565b72..3547565b72 100644
--- a/branches/sca-java-1.4/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/pom.xml
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 7853b597d3..7853b597d3 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 9c09ef50c2..9c09ef50c2 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e6cb35cc4b..e6cb35cc4b 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index 1454851fb1..1454851fb1 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 42e45317b7..42e45317b7 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 126b435989..126b435989 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 2782ffd8db..2782ffd8db 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 4384213bf5..4384213bf5 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index ed00510a67..ed00510a67 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
index 14b0577f65..14b0577f65 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 66f98adce3..66f98adce3 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 5a454f176c..5a454f176c 100644
--- a/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/pom.xml
index 7aaaa6130b..7aaaa6130b 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
index 13203d4adc..13203d4adc 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
index 67124832f3..67124832f3 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index f9ddda6d98..f9ddda6d98 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 6302913c25..6302913c25 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index be80606343..be80606343 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 9c23458743..9c23458743 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 553c764233..553c764233 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 30d2039e80..30d2039e80 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
index 7355d3390d..7355d3390d 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
index f0228edb1f..f0228edb1f 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index dc7e1ced38..dc7e1ced38 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index c392b92f8a..c392b92f8a 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index cf379a1b11..cf379a1b11 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index ff18c65c69..ff18c65c69 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index f23b0d2b59..f23b0d2b59 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 2d3a3a54ff..2d3a3a54ff 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index c27a1dbd70..c27a1dbd70 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 6448291f41..6448291f41 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index 105b3da7fa..105b3da7fa 100644
--- a/branches/sca-java-1.4/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.4/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
index 7cdf801692..7cdf801692 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
index b0b6644e7f..b0b6644e7f 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/pom.xml
index 27622885c8..27622885c8 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 2a5dd07d08..2a5dd07d08 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 039e75f437..039e75f437 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index 95985dcc28..95985dcc28 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index c0da060af2..c0da060af2 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
index 0b707163da..0b707163da 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
index d73cccb714..d73cccb714 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 16e9cf43f3..16e9cf43f3 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 1f2263e1c9..1f2263e1c9 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 3719bbd79a..3719bbd79a 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 18fce72f90..18fce72f90 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
index f18eaef27b..f18eaef27b 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
index 317b9cce81..317b9cce81 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index ab6467bfd7..ab6467bfd7 100644
--- a/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-java-1.4/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/LICENSE
diff --git a/branches/sca-java-1.4/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/interface/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/NOTICE
diff --git a/branches/sca-java-1.4/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/interface/pom.xml
index e0833abce4..e0833abce4 100644
--- a/branches/sca-java-1.4/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/pom.xml
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index 247a432330..247a432330 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 1f5620c0b9..1f5620c0b9 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 70f6d5b403..70f6d5b403 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index f9de645a6e..f9de645a6e 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 5601b09660..5601b09660 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 2a273c9a26..2a273c9a26 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 4676e35f80..4676e35f80 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 6773b29088..6773b29088 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index c1c8400b71..c1c8400b71 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 15581b5e04..15581b5e04 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 9e7d6882f7..9e7d6882f7 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index e2a524c5e0..e2a524c5e0 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 00a5dc3065..00a5dc3065 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 777fa567f1..777fa567f1 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 844b0af509..844b0af509 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 54c0a3ec11..54c0a3ec11 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 2598dc8545..2598dc8545 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 12db460959..12db460959 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 26ecf6e352..26ecf6e352 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-1.4/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index 821c58bde1..821c58bde1 100644
--- a/branches/sca-java-1.4/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 269a3dc038..269a3dc038 100644
--- a/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 338170da52..338170da52 100644
--- a/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-java-1.4/modules/monitor/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/monitor/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/LICENSE
diff --git a/branches/sca-java-1.4/modules/monitor/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/monitor/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/NOTICE
diff --git a/branches/sca-java-1.4/modules/monitor/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/pom.xml
index be3e7cd894..be3e7cd894 100644
--- a/branches/sca-java-1.4/modules/monitor/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/pom.xml
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index c16140213d..c16140213d 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 38c3bbd991..38c3bbd991 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
index 83a2d63eae..83a2d63eae 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
index 274b4faefd..274b4faefd 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
index b98f29d4dd..b98f29d4dd 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
diff --git a/branches/sca-java-1.4/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
index 0212a69382..0212a69382 100644
--- a/branches/sca-java-1.4/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
diff --git a/branches/sca-java-1.4/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/pom.xml
index 9519e7c8fa..9519e7c8fa 100644
--- a/branches/sca-java-1.4/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
index f390e8881e..f390e8881e 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
index de7f352122..de7f352122 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
index fea749a57c..fea749a57c 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
index a1d4ddb2b1..a1d4ddb2b1 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
index 2b0dbc88eb..2b0dbc88eb 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
diff --git a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index e41afd29c4..e41afd29c4 100644
--- a/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-java-1.4/modules/node-dynamic/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-dynamic/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-dynamic/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-dynamic/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-dynamic/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/pom.xml
index a3951a1421..a3951a1421 100644
--- a/branches/sca-java-1.4/modules/node-dynamic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
index af6155e500..af6155e500 100644
--- a/branches/sca-java-1.4/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-dynamic/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/src/main/resources/log4j.properties
index e5b3f8ebfb..e5b3f8ebfb 100644
--- a/branches/sca-java-1.4/modules/node-dynamic/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-dynamic/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.4/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/node-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/node-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/pom.xml
index 660d46588e..660d46588e 100644
--- a/branches/sca-java-1.4/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
index 419900c5ac..419900c5ac 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
index bc2f10fb7e..bc2f10fb7e 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index 18b166acdd..18b166acdd 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 2103ca9d0f..2103ca9d0f 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
index 5b0e31fd03..5b0e31fd03 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
index 6c93fa7800..6c93fa7800 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
index 4215855ac9..4215855ac9 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
diff --git a/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
index 800bdd84cc..800bdd84cc 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
index 52d96dd72d..52d96dd72d 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index d620f6b62a..d620f6b62a 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/resources/HelloWorld.composite
index 9e3299d691..9e3299d691 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1d37bcebe0..1d37bcebe0 100644
--- a/branches/sca-java-1.4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
index 9dbc78e9c6..9dbc78e9c6 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index 61187eecac..61187eecac 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
index efe4d7bf8a..efe4d7bf8a 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 63313b6f39..63313b6f39 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
index 90d682a74b..90d682a74b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
index 0f595df758..0f595df758 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
index 4ff93ea84b..4ff93ea84b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index b77382d6a0..b77382d6a0 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index f3bb8c04ae..f3bb8c04ae 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index b422651244..b422651244 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 17172dbd5e..17172dbd5e 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
index cf9c0f74df..cf9c0f74df 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 11e008619c..11e008619c 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index da0ab774a3..da0ab774a3 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index b16045a103..b16045a103 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..0608e70ca5 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
index 5929ee36ba..5929ee36ba 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
index 0214d5185f..0214d5185f 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
index f94c43bd52..f94c43bd52 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
index 5e4a0ed338..5e4a0ed338 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
index 38c7093a16..38c7093a16 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
index afd6804ad2..afd6804ad2 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
index bf17222e34..bf17222e34 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
index f0e4e9da70..f0e4e9da70 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
index ea487c384b..ea487c384b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
index adba1e2da7..adba1e2da7 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
index 445ea80786..445ea80786 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
index fcbe259dba..fcbe259dba 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
index c5ea0439de..c5ea0439de 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
index e5194d0e5f..e5194d0e5f 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
index 97976e256a..97976e256a 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
index 9e3299d691..9e3299d691 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
index 52e369dd21..52e369dd21 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-java-1.4/modules/node-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/pom.xml
index f5c3864e10..f5c3864e10 100644
--- a/branches/sca-java-1.4/modules/node-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index eb06ad7411..eb06ad7411 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 7cfabfe265..7cfabfe265 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index be9bdb15c4..be9bdb15c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 7be1e14988..7be1e14988 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.4/modules/node-manager/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/node-manager/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-manager/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.4/modules/node-manager/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/pom.xml
index 2a94601c95..2a94601c95 100644
--- a/branches/sca-java-1.4/modules/node-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
index 8dfae91314..8dfae91314 100644
--- a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
diff --git a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
index 019c2562ec..019c2562ec 100644
--- a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
diff --git a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
index d0475e1dd3..d0475e1dd3 100644
--- a/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
diff --git a/branches/sca-java-1.4/modules/node-manager/src/main/resources/NodeDaemon.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/resources/NodeDaemon.composite
index cb587b02fd..cb587b02fd 100644
--- a/branches/sca-java-1.4/modules/node-manager/src/main/resources/NodeDaemon.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-manager/src/main/resources/NodeDaemon.composite
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/LICENSE
index 43e91eb0b0..43e91eb0b0 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/pom.xml
index 71f430f4ec..71f430f4ec 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
index 43101b14c9..43101b14c9 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
index f8b56c88d6..f8b56c88d6 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
index 19041daf50..19041daf50 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
index b87f70deef..b87f70deef 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
index 79b1c0a5f4..79b1c0a5f4 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
index 1dbe75f431..1dbe75f431 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index bd3fd72280..bd3fd72280 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
index 7ce3f6c18f..7ce3f6c18f 100644
--- a/branches/sca-java-1.4/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/policy-logging/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-logging/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/policy-logging/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/pom.xml
index ae03046564..ae03046564 100644
--- a/branches/sca-java-1.4/modules/policy-logging/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 4220caab80..4220caab80 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index c53c37ccf6..c53c37ccf6 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index 731b2d8d62..731b2d8d62 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index 58a6d21ee7..58a6d21ee7 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 83526e0f03..83526e0f03 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 9bbae8956f..9bbae8956f 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index feddc8c056..feddc8c056 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 472f76c680..472f76c680 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index e14c657d80..e14c657d80 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 956a8983a2..956a8983a2 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index d5b1b9eedc..d5b1b9eedc 100644
--- a/branches/sca-java-1.4/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.4/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.4/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index fabb554236..fabb554236 100644
--- a/branches/sca-java-1.4/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.4/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-java-1.4/modules/policy-reliability/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-reliability/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-reliability/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/pom.xml
index 0febf40d3e..0febf40d3e 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
index 60e28f5231..60e28f5231 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 7f616cb3d4..7f616cb3d4 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
index df87906ab8..df87906ab8 100644
--- a/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/pom.xml
index ab2ca7251e..ab2ca7251e 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
index befe398129..befe398129 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
index f639bc679f..f639bc679f 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 550e6d3708..550e6d3708 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
index 894117354e..894117354e 100644
--- a/branches/sca-java-1.4/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
diff --git a/branches/sca-java-1.4/modules/policy-security/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/policy-security/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-security/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/policy-security/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/pom.xml
index 8b89e94d51..8b89e94d51 100644
--- a/branches/sca-java-1.4/modules/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
index 81bc3271c6..81bc3271c6 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index c4909d6bd8..c4909d6bd8 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 1b89b52a31..1b89b52a31 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 348934bd6c..348934bd6c 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
index 3ab9cb656d..3ab9cb656d 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index c38b95286e..c38b95286e 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index 5aa36ecc89..5aa36ecc89 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index e783d77c97..e783d77c97 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index aae0386589..aae0386589 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
index 147b863c01..147b863c01 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index d58fa51256..d58fa51256 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index dcc85f809c..dcc85f809c 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index 1559e22cb9..1559e22cb9 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index aa52e0bc41..aa52e0bc41 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 8f848ef06a..8f848ef06a 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index bdf40f999f..bdf40f999f 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
index a20f314a2a..a20f314a2a 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
index cfe856e0f2..cfe856e0f2 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 185982a749..185982a749 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 328c290fad..328c290fad 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index f41d36194a..f41d36194a 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index b7736fa817..b7736fa817 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 48d8731552..48d8731552 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/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.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bf8e4d11b4..bf8e4d11b4 100644
--- a/branches/sca-java-1.4/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.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0363fbd981..0363fbd981 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index f8f0634a9a..f8f0634a9a 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 91383eaf6a..91383eaf6a 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 2414fd777e..2414fd777e 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-java-1.4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-transaction/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-transaction/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/pom.xml
index c24fa32169..c24fa32169 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
index 3c11fef865..3c11fef865 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index b3e90c23cd..b3e90c23cd 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index 3339f2e338..3339f2e338 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index a13748f232..a13748f232 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
index 7b10a7d568..7b10a7d568 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f178876a72..f178876a72 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 0579890a42..0579890a42 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
index be97090378..be97090378 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
index 0795a4e5cf..0795a4e5cf 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
index 9f9088a380..9f9088a380 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index eeec814f60..eeec814f60 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index e9d9fab519..e9d9fab519 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index ff51b131b7..ff51b131b7 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
index 324fa03da6..324fa03da6 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index e8560d775d..e8560d775d 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/pom.xml
index 830fc884f9..830fc884f9 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 263c766948..263c766948 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2e11e31fec..2e11e31fec 100644
--- a/branches/sca-java-1.4/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.4/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index b887257efe..b887257efe 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index 8c138a57dd..8c138a57dd 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
index 13b3c44521..13b3c44521 100644
--- a/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.4/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.4/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.4/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.4/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/pom.xml
index c820748a4c..c820748a4c 100644
--- a/branches/sca-java-1.4/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index d47cbd7dbe..d47cbd7dbe 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 119afa3473..119afa3473 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index ec357aea93..ec357aea93 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 3f1008e9a8..3f1008e9a8 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 76ef8df298..76ef8df298 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 81ca27a085..81ca27a085 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 7c205292b0..7c205292b0 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index abe80e2a54..abe80e2a54 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 73795349c1..73795349c1 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-1.4/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.4/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c41a0cd01f..c41a0cd01f 100644
--- a/branches/sca-java-1.4/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.4/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
index 40107bb11e..40107bb11e 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index c9fad18157..c9fad18157 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index ce5b204787..ce5b204787 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.4/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b51a6fba98..b51a6fba98 100644
--- a/branches/sca-java-1.4/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.4/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/LICENSE
diff --git a/branches/sca-java-1.4/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/policy/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.4/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/NOTICE
diff --git a/branches/sca-java-1.4/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/policy/pom.xml
index 57cd2c0cc6..57cd2c0cc6 100644
--- a/branches/sca-java-1.4/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/pom.xml
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index 6ca4fe72ec..6ca4fe72ec 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index 22f328f643..22f328f643 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index bf2cfca924..bf2cfca924 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 6db529c7f0..6db529c7f0 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index ee67006875..ee67006875 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 1b225bc918..1b225bc918 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index c6393e2ada..c6393e2ada 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index 65c39803d2..65c39803d2 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 49bcbae1ae..49bcbae1ae 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index b16072c214..b16072c214 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index f4156fc2e6..f4156fc2e6 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index caa0d04fe3..caa0d04fe3 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 28ff9d09d3..28ff9d09d3 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 0f43221dd6..0f43221dd6 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 0f8b1ae00a..0f8b1ae00a 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 7861fd79f9..7861fd79f9 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index aa6e27c240..aa6e27c240 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 2d6bd0eb6f..2d6bd0eb6f 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index a0e2f10f56..a0e2f10f56 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 179a10cc1a..179a10cc1a 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 98a116fe7b..98a116fe7b 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index e5002d2cdc..e5002d2cdc 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index d6f65b1788..d6f65b1788 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 2e4c6a9d78..2e4c6a9d78 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index 1f91710f95..1f91710f95 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index 3a37ed3c41..3a37ed3c41 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index c80e68a0be..c80e68a0be 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index 6d6420017f..6d6420017f 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index eb97818042..eb97818042 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index afb3c035ae..afb3c035ae 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-1.4/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 636ff5ab45..636ff5ab45 100644
--- a/branches/sca-java-1.4/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-1.4/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/pom.xml
index 5248168c14..5248168c14 100644
--- a/branches/sca-java-1.4/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/pom.xml
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/LICENSE
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/NOTICE
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/pom.xml
index 42ee3a0632..42ee3a0632 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/pom.xml
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
index 45ea279889..45ea279889 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
index e05004160c..e05004160c 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
index 7351ecabe0..7351ecabe0 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
index c8d3aa7a46..c8d3aa7a46 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
index b19e2326a2..b19e2326a2 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
index 38280443f0..38280443f0 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
index 112b404515..112b404515 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
index 8764094d48..8764094d48 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index e59ade0150..e59ade0150 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.4/modules/runtime-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.4/modules/runtime-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.4/modules/runtime-war/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/runtime-war/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/LICENSE
diff --git a/branches/sca-java-1.4/modules/runtime-war/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/runtime-war/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/NOTICE
diff --git a/branches/sca-java-1.4/modules/runtime-war/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/pom.xml
index 80c1f29506..80c1f29506 100644
--- a/branches/sca-java-1.4/modules/runtime-war/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime-war/pom.xml
diff --git a/branches/sca-java-1.4/modules/runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/LICENSE
diff --git a/branches/sca-java-1.4/modules/runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/NOTICE
diff --git a/branches/sca-java-1.4/modules/runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/pom.xml
index 399b221eb1..399b221eb1 100644
--- a/branches/sca-java-1.4/modules/runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/pom.xml
diff --git a/branches/sca-java-1.4/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
index 1f03ade970..1f03ade970 100644
--- a/branches/sca-java-1.4/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
diff --git a/branches/sca-java-1.4/modules/sca-api-extension/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
diff --git a/branches/sca-java-1.4/modules/sca-api-extension/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
index cd088e9179..cd088e9179 100644
--- a/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
diff --git a/branches/sca-java-1.4/modules/sca-api-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
index 9a025e35dd..9a025e35dd 100644
--- a/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
diff --git a/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
index d60232b11c..d60232b11c 100644
--- a/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
diff --git a/branches/sca-java-1.4/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/LICENSE
index 617c69079b..617c69079b 100644
--- a/branches/sca-java-1.4/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/LICENSE
diff --git a/branches/sca-java-1.4/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/NOTICE
index 4fe77f0e58..4fe77f0e58 100644
--- a/branches/sca-java-1.4/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/NOTICE
diff --git a/branches/sca-java-1.4/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/pom.xml
index a5d3806796..a5d3806796 100644
--- a/branches/sca-java-1.4/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/pom.xml
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index 7f6756bcbd..7f6756bcbd 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 52290a4bba..52290a4bba 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 12733a7bd2..12733a7bd2 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 2e3b71fd1c..2e3b71fd1c 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 0a0c2afff9..0a0c2afff9 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index cdcfa9a791..cdcfa9a791 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8da6bcd1f3..8da6bcd1f3 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 70f5f904a4..70f5f904a4 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index dd6b1c3242..dd6b1c3242 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index 556dd4e68e..556dd4e68e 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index f7fca41212..f7fca41212 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index 0ee613fdcb..0ee613fdcb 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index bc73d22c9d..bc73d22c9d 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index 25ade6f091..25ade6f091 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index bc09c8ccdd..bc09c8ccdd 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index baacb2f520..baacb2f520 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index e9fcfee2d3..e9fcfee2d3 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index b2f6f17129..b2f6f17129 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f0350f8ff5..f0350f8ff5 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index d65558653b..d65558653b 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index 21bf986705..21bf986705 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index c65ff5838f..c65ff5838f 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index d610e21d64..d610e21d64 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index a8cf28475b..a8cf28475b 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index fc925aa402..fc925aa402 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index eaf9e3207c..eaf9e3207c 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index b22a6a840c..b22a6a840c 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 71af35634d..71af35634d 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index 44388bea74..44388bea74 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index 4d71b3f357..4d71b3f357 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 53d58b7dc1..53d58b7dc1 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index 3af699de07..3af699de07 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index cd88df1128..cd88df1128 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 62f4abdbee..62f4abdbee 100644
--- a/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/LICENSE
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/NOTICE
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat
index d50ec6513d..d50ec6513d 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/pom.xml
index 98c77dc7b1..98c77dc7b1 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/pom.xml
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
index 630bcb285b..630bcb285b 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
index 965cfa5b5d..965cfa5b5d 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
index 262742e867..262742e867 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
index 0178ebdb6e..0178ebdb6e 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
index c5b623d27f..c5b623d27f 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
diff --git a/branches/sca-java-1.4/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
index 7b76faaf36..7b76faaf36 100644
--- a/branches/sca-java-1.4/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/LICENSE
diff --git a/branches/sca-java-1.4/modules/workspace-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/NOTICE
diff --git a/branches/sca-java-1.4/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/pom.xml
index 96bba82324..96bba82324 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/pom.xml
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index 016c764d47..016c764d47 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index d0f769c9d1..d0f769c9d1 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
index 6ef0fa753d..6ef0fa753d 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
index 45ba8c0609..45ba8c0609 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
index 9dd1b3a15b..9dd1b3a15b 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 41d0ebe27d..41d0ebe27d 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
index 2e8326c062..2e8326c062 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index f7b6b35679..f7b6b35679 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-java-1.4/modules/workspace-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/workspace-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/pom.xml
index 7fb0ef8c06..7fb0ef8c06 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index 49041b3263..49041b3263 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index d0665a4ec8..d0665a4ec8 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ea7874b52..9ea7874b52 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
index e054591a31..e054591a31 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
index 8e4d30e7a0..8e4d30e7a0 100644
--- a/branches/sca-java-1.4/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/workspace/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/workspace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/LICENSE
diff --git a/branches/sca-java-1.4/modules/workspace/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/workspace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/NOTICE
diff --git a/branches/sca-java-1.4/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/pom.xml
index cc2917cadf..cc2917cadf 100644
--- a/branches/sca-java-1.4/modules/workspace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/pom.xml
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 66f38afec7..66f38afec7 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
index 6fab700243..6fab700243 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index e60a5d8108..e60a5d8108 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
diff --git a/branches/sca-java-1.4/modules/xsd-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/LICENSE
diff --git a/branches/sca-java-1.4/modules/xsd-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/NOTICE
diff --git a/branches/sca-java-1.4/modules/xsd-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/pom.xml
index e11f0fa805..e11f0fa805 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/pom.xml
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
index a057bbe155..a057bbe155 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
index 66e2e46148..66e2e46148 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index f05a2e4cbe..f05a2e4cbe 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 1ec3d27200..1ec3d27200 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index a67ecf063a..a67ecf063a 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
index ab50456510..ab50456510 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
index f245377d87..f245377d87 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
index 76e6a57c29..76e6a57c29 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.4/modules/xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/xsd/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/LICENSE
diff --git a/branches/sca-java-1.4/modules/xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/modules/xsd/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/NOTICE
diff --git a/branches/sca-java-1.4/modules/xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/pom.xml
index 0edcda0b82..0edcda0b82 100644
--- a/branches/sca-java-1.4/modules/xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/pom.xml
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
index 92dce98fa1..92dce98fa1 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
index 08a1c8dd63..08a1c8dd63 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
index 9a973cd095..9a973cd095 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
index 60ff6b6fd9..60ff6b6fd9 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
index e57cbee8b8..e57cbee8b8 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-1.4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
index ca06127c06..ca06127c06 100644
--- a/branches/sca-java-1.4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory