Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835139 13f79535-47bb-0310-9956-ffa450edef68

379 files changed, 0 insertions, 0 deletions

diff --git a/branches/java-M1/java/sca/core/pom.xml b/sca-java-1.x/branches/java-M1/java/sca/core/pom.xml
index b5e934d45e..b5e934d45e 100644
--- a/branches/java-M1/java/sca/core/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/pom.xml
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java
index 6acebdaa8e..6acebdaa8e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java
index 08a718bd73..08a718bd73 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/work/DefaultWorkManager.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/work/DefaultWorkManager.java
index 866e101b0e..866e101b0e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/work/DefaultWorkManager.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/async/work/DefaultWorkManager.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderConfigException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderConfigException.java
index c2402d9141..c2402d9141 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderConfigException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderConfigException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderException.java
index 246f188988..246f188988 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java
index cd57eaf7ab..cd57eaf7ab 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
index 24b526371d..24b526371d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
index ccef8024e8..ccef8024e8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
index 786298809e..786298809e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilderRegistry.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilderRegistry.java
index a002627c2e..a002627c2e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilderRegistry.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilderRegistry.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextResolver.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextResolver.java
index 5c99d6dd43..5c99d6dd43 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextResolver.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextResolver.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java
index ace34a1ad5..ace34a1ad5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
index 34b6294638..34b6294638 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ObjectFactory.java
index ab2cfd9bac..ab2cfd9bac 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java
index 489541a213..489541a213 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java
index 1038b6e878..1038b6e878 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java
index 76a376e3d5..76a376e3d5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java
index 6bc3bcda6e..6bc3bcda6e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java
index 10c34751e2..10c34751e2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java
index 4b596bfdc1..4b596bfdc1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java
index 24c1fa24ff..24c1fa24ff 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
index 54f2ff4b4e..54f2ff4b4e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
index 8f0cbbf91b..8f0cbbf91b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitorImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitorImpl.java
index 178d3d4de6..178d3d4de6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitorImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitorImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ContextFactoryBuilderRegistryImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ContextFactoryBuilderRegistryImpl.java
index d500b2e503..d500b2e503 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ContextFactoryBuilderRegistryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ContextFactoryBuilderRegistryImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
index 5243c2a8cd..5243c2a8cd 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
index ffab32bd37..ffab32bd37 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
index 5d37eb8e89..5d37eb8e89 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
index 1dc6627306..1dc6627306 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java
index 4c53a2c830..4c53a2c830 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java
index fb9b0b25db..fb9b0b25db 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
index 556b0991f7..556b0991f7 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
index fe78cd712a..fe78cd712a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java
index 9f9c125a5e..9f9c125a5e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
index de0e4a3733..de0e4a3733 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationLoadException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationLoadException.java
index 2a9e325b0b..2a9e325b0b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationLoadException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationLoadException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java
index cc5f2999fe..cc5f2999fe 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidMetaDataException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidMetaDataException.java
index 71b2329044..71b2329044 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidMetaDataException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidMetaDataException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidRootElementException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidRootElementException.java
index a355d884a5..a355d884a5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidRootElementException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidRootElementException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidSetterException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidSetterException.java
index ed4e53645f..ed4e53645f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidSetterException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/InvalidSetterException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java
index 9d74633519..9d74633519 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MetaDataException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MetaDataException.java
index 30840a6e15..30840a6e15 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MetaDataException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MetaDataException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingInterfaceException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingInterfaceException.java
index 6164b6a011..6164b6a011 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingInterfaceException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingInterfaceException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingResourceException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingResourceException.java
index 8260dbc8ae..8260dbc8ae 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingResourceException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/MissingResourceException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java
index 15857441b1..15857441b1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/SidefileLoadException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/SidefileLoadException.java
index b432d4ea68..b432d4ea68 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/SidefileLoadException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/SidefileLoadException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
index a77031b8c5..a77031b8c5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
index fdbb6e0942..fdbb6e0942 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
index 3bd6e6361d..3bd6e6361d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java
index 0314bcc9bf..0314bcc9bf 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java
index ff5c3736b7..ff5c3736b7 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java
index 8445526dc8..8445526dc8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java
index a16845bbf8..a16845bbf8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java
index 175de28a92..175de28a92 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java
index 9f4a53a651..9f4a53a651 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorHelper.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorHelper.java
index d4c6c4a40e..d4c6c4a40e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorHelper.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorHelper.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorUtils.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorUtils.java
index b0400c183f..b0400c183f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorUtils.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ProcessorUtils.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java
index 9191b75793..9191b75793 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java
index bc8ef02777..bc8ef02777 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java
index 007410b500..007410b500 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java
index e81430115a..e81430115a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java
index 2c7ba823f2..2c7ba823f2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
index 7d4b990ab5..7d4b990ab5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireContext.java
index 7fa459e76d..7fa459e76d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java
index 4da4206a94..4da4206a94 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java
index abd23feb38..abd23feb38 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java
index 558de7609f..558de7609f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ConfigurationContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
index df313d8000..df313d8000 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java
index e024a98b0e..e024a98b0e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
index 0d35f145dc..0d35f145dc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
index 63e6f18e99..63e6f18e99 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java
index 81a334d3c8..81a334d3c8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
index 63feabc43c..63feabc43c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventContext.java
index 36b0f98928..36b0f98928 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventException.java
index aaf26aee69..aaf26aee69 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventFilter.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventFilter.java
index ee1334bef2..ee1334bef2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventFilter.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventFilter.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventPublisher.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventPublisher.java
index c7ccf88e25..c7ccf88e25 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventPublisher.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/EventPublisher.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
index f7b4a6c572..f7b4a6c572 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/InvalidNameException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/InvalidNameException.java
index 65c709e569..65c709e569 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/InvalidNameException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/InvalidNameException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java
index 6572841cf0..6572841cf0 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingContextFactoryException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingContextFactoryException.java
index fd4d613e34..fd4d613e34 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingContextFactoryException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingContextFactoryException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingImplementationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingImplementationException.java
index 787e9cae20..787e9cae20 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingImplementationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingImplementationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingScopeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingScopeException.java
index 53108e6e6b..53108e6e6b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingScopeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/MissingScopeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ProxyConfigurationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ProxyConfigurationException.java
index 2d15118c1c..2d15118c1c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ProxyConfigurationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ProxyConfigurationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/QualifiedName.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/QualifiedName.java
index a9a0baeff9..a9a0baeff9 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/QualifiedName.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/QualifiedName.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/RuntimeEventListener.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/RuntimeEventListener.java
index 89cc51f3fc..89cc51f3fc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/RuntimeEventListener.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
index d57d59cb58..d57d59cb58 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
index c582bde2b4..c582bde2b4 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeIdentifier.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeIdentifier.java
index d25477f71c..d25477f71c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeIdentifier.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeIdentifier.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeInitializationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeInitializationException.java
index 6ef5bfe9dd..6ef5bfe9dd 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeInitializationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeInitializationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeRuntimeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeRuntimeException.java
index 5022f7589d..5022f7589d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeRuntimeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeRuntimeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java
index c01df8ff9e..c01df8ff9e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ServiceNotFoundException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ServiceNotFoundException.java
index ee8c9f91b8..ee8c9f91b8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ServiceNotFoundException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/ServiceNotFoundException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemCompositeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemCompositeContext.java
index 7e3b4b8045..7e3b4b8045 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemCompositeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/SystemCompositeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/TargetException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/TargetException.java
index dd39d06aa1..dd39d06aa1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/TargetException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/TargetException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java
index cef0c25a63..cef0c25a63 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractRequestEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractRequestEvent.java
index c038f141b5..c038f141b5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractRequestEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractRequestEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/Event.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/Event.java
index 5b370b8c73..5b370b8c73 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/Event.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/Event.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionBound.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionBound.java
index 8af7042ad3..8af7042ad3 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionBound.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionBound.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEnd.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEnd.java
index 3b2aff1353..3b2aff1353 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEnd.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEvent.java
index ecfbefa808..ecfbefa808 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/HttpSessionEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/InstanceCreated.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/InstanceCreated.java
index d157b4b1e1..d157b4b1e1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/InstanceCreated.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/InstanceCreated.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java
index 48de538048..48de538048 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStart.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStart.java
index d953ddd65f..d953ddd65f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStart.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStart.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStop.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStop.java
index fb3c31bdff..fb3c31bdff 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStop.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleStop.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEnd.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEnd.java
index 1cbe024be3..1cbe024be3 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEnd.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEnd.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEvent.java
index 0b7e1b8005..0b7e1b8005 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestStart.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestStart.java
index 8c07a3d607..8c07a3d607 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestStart.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/RequestStart.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionBound.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionBound.java
index 5d977911be..5d977911be 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionBound.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionBound.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEnd.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEnd.java
index 809d63bd0f..809d63bd0f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEnd.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEnd.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java
index 7eaff1de24..7eaff1de24 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionStart.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionStart.java
index cfe490e2ff..cfe490e2ff 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionStart.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionStart.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java
index 35601646f2..35601646f2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
index c9e563302c..c9e563302c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java
index 680267d53e..680267d53e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java
index ddeebe361f..ddeebe361f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
index ec3d1bc9c0..ec3d1bc9c0 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
index d1ad7a5548..d1ad7a5548 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EventContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EventContextImpl.java
index 6888e66f20..6888e66f20 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EventContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EventContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
index 0ab44fa8fc..0ab44fa8fc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
index 7eed472101..7eed472101 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeStrategy.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeStrategy.java
index f89d09196d..f89d09196d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeStrategy.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeStrategy.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
index 7468ff9dd6..7468ff9dd6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
index 1f386fd35f..1f386fd35f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
index dbb342bb5a..dbb342bb5a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
index 67ce176af5..67ce176af5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java
index c5785d25f7..c5785d25f7 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
index 46bf58b548..46bf58b548 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ComponentTargetInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ComponentTargetInvoker.java
index 57fcffc2b2..57fcffc2b2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ComponentTargetInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ComponentTargetInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
index 81770d49b8..81770d49b8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java
index 58d7a626a6..58d7a626a6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointContextFactory.java
index bb4d1207d4..bb4d1207d4 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java
index 7c030324f1..7c030324f1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceContextFactory.java
index 396da3d39e..396da3d39e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceInvoker.java
index 0424bf5de6..0424bf5de6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceTargetInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceTargetInvoker.java
index 0d664e0207..0d664e0207 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceTargetInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceTargetInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
index 5b2d9de0e3..5b2d9de0e3 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/ImplementationProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/ImplementationProcessor.java
index b464a7f00f..b464a7f00f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/ImplementationProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/ImplementationProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/InjectorExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/InjectorExtensibilityElement.java
index 50818d1ac0..50818d1ac0 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/InjectorExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/InjectorExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/JavaExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/JavaExtensibilityElement.java
index fba57d8254..fba57d8254 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/JavaExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/JavaExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ComponentNameExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ComponentNameExtensibilityElement.java
index e04ca34da6..e04ca34da6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ComponentNameExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ComponentNameExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ContextExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ContextExtensibilityElement.java
index 9099132e36..9099132e36 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ContextExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/ContextExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/DestroyInvokerExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/DestroyInvokerExtensibilityElement.java
index 9952f507b2..9952f507b2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/DestroyInvokerExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/DestroyInvokerExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InitInvokerExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InitInvokerExtensibilityElement.java
index 4c542b4b5d..4c542b4b5d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InitInvokerExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InitInvokerExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InvokerExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InvokerExtensibilityElement.java
index a87acd16cc..a87acd16cc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InvokerExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/extensibility/InvokerExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
index 6facd25e59..6facd25e59 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/EventInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/EventInvoker.java
index 6f5de43b96..6f5de43b96 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/EventInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/EventInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FactoryInitException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FactoryInitException.java
index 589ae796ac..589ae796ac 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FactoryInitException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FactoryInitException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
index 7be73462d3..7be73462d3 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
index 2c26f3c4b1..2c26f3c4b1 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
index 306dab3e98..306dab3e98 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
index 55d8a88790..55d8a88790 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
index bed7db887a..bed7db887a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java
index 69c7670c03..69c7670c03 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
index 6095061872..6095061872 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
index 7f7a307433..7f7a307433 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NullEventInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NullEventInvoker.java
index e8f109f2d8..e8f109f2d8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NullEventInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NullEventInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java
index 44edee43eb..44edee43eb 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCreationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCreationException.java
index 875eda3680..875eda3680 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCreationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCreationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
index fac8248b0c..fac8248b0c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
index 8a7e0bf782..8a7e0bf782 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/InvalidPropertyFactoryException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/InvalidPropertyFactoryException.java
index 9ccbbb3a7a..9ccbbb3a7a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/InvalidPropertyFactoryException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/InvalidPropertyFactoryException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
index cef7353bbf..cef7353bbf 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
index e1a9f55ca4..e1a9f55ca4 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
index a38d388815..a38d388815 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java
index a05597b51b..a05597b51b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
index f9ac2b0559..f9ac2b0559 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/WSDLDefinitionRegistry.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/WSDLDefinitionRegistry.java
index f88e0f0b35..f88e0f0b35 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/WSDLDefinitionRegistry.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/WSDLDefinitionRegistry.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
index fce343df4b..fce343df4b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AssemblyConstants.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AssemblyConstants.java
index 73ef4119f8..73ef4119f8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AssemblyConstants.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AssemblyConstants.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
index 0fa3e7ddeb..0fa3e7ddeb 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
index fdb8893830..fdb8893830 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java
index 9b22a24784..9b22a24784 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
index 14b60964d5..14b60964d5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
index 4910c016d8..4910c016d8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
index 6981f05372..6981f05372 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
index 602cf2cc0a..602cf2cc0a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
index 9617cf805f..9617cf805f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
index 4b3e96cfab..4b3e96cfab 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
index 08ab23b3a6..08ab23b3a6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
index cbf1ca00df..cbf1ca00df 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
index aa95210757..aa95210757 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
index 9cb31b55ff..9cb31b55ff 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/WireLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/WireLoader.java
index 0ae3c4405d..0ae3c4405d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/WireLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/WireLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
index 763c88295c..763c88295c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
index 1e9e8ec8fb..1e9e8ec8fb 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
index 2ed33f895c..2ed33f895c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/WSDLDefinitionRegistryImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/WSDLDefinitionRegistryImpl.java
index 1063dec3fc..1063dec3fc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/WSDLDefinitionRegistryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/WSDLDefinitionRegistryImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
index d75f25a232..d75f25a232 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
index b9f35d8656..b9f35d8656 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
index dc623af1fc..dc623af1fc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java
index 265e4ba601..265e4ba601 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java
index a30f17a938..a30f17a938 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
index f7f365952c..f7f365952c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
index 16e1fc6483..16e1fc6483 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
index 0ebc063b90..0ebc063b90 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
index c1b87d6a13..c1b87d6a13 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
index 5051c2674d..5051c2674d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/DataFactoryObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/DataFactoryObjectFactory.java
index 6b35115e1f..6b35115e1f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/DataFactoryObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/DataFactoryObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/TypeHelperObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/TypeHelperObjectFactory.java
index d345e7be95..d345e7be95 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/TypeHelperObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/TypeHelperObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XMLHelperObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XMLHelperObjectFactory.java
index 04773f9770..04773f9770 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XMLHelperObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XMLHelperObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XSDHelperObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XSDHelperObjectFactory.java
index eaddf15cb2..eaddf15cb2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XSDHelperObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/XSDHelperObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelper.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelper.java
index a804fc51b4..a804fc51b4 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelper.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelper.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperExtensibilityElement.java
index c6f84fa485..c6f84fa485 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperProcessor.java
index dc8d97779f..dc8d97779f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/sdo/helper/SDOHelperProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
index 5eb1f6b926..5eb1f6b926 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Monitor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Monitor.java
index aa552b8e0d..aa552b8e0d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Monitor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Monitor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/ParentContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/ParentContext.java
index a9d07dbb5f..a9d07dbb5f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/ParentContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/ParentContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemAssemblyFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemAssemblyFactory.java
index fea8d24ba6..fea8d24ba6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemAssemblyFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemAssemblyFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemBinding.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemBinding.java
index edc7c87c85..edc7c87c85 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemBinding.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemBinding.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemImplementation.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemImplementation.java
index a6a024ceca..a6a024ceca 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemImplementation.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemImplementation.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemModule.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemModule.java
index a43aca67a2..a43aca67a2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemModule.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemModule.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java
index c0d97c9a35..c0d97c9a35 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemBindingImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemBindingImpl.java
index a9996065e2..a9996065e2 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemBindingImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemBindingImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemImplementationImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemImplementationImpl.java
index cca3aef1bb..cca3aef1bb 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemImplementationImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemImplementationImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java
index 98198cba85..98198cba85 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
index 835324c392..835324c392 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
index c366da53d6..c366da53d6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
index a568e9aa2f..a568e9aa2f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
index 2e4a2916ce..2e4a2916ce 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
index c9cfeccd6b..c9cfeccd6b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExtensibilityElement.java
index 14655c2393..14655c2393 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
index d62afa4425..d62afa4425 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemInjectorExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemInjectorExtensibilityElement.java
index 7fca219399..7fca219399 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemInjectorExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemInjectorExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
index d4a21dd427..d4a21dd427 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/AutowireExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/AutowireExtensibilityElement.java
index 42d3151c78..42d3151c78 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/AutowireExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/AutowireExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/MonitorExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/MonitorExtensibilityElement.java
index 61c89d991b..61c89d991b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/MonitorExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/MonitorExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/ParentContextExtensibilityElement.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/ParentContextExtensibilityElement.java
index b95b87c8de..b95b87c8de 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/ParentContextExtensibilityElement.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/extensibility/ParentContextExtensibilityElement.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/AutowireProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/AutowireProcessor.java
index 1885a5eaaa..1885a5eaaa 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/AutowireProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/AutowireProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/MonitorProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/MonitorProcessor.java
index 9d7f535cc8..9d7f535cc8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/MonitorProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/MonitorProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/ParentContextProcessor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/ParentContextProcessor.java
index 1ddc68e3e8..1ddc68e3e8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/ParentContextProcessor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/ParentContextProcessor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java
index 374555bfb6..374555bfb6 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
index 9ac0abe38a..9ac0abe38a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
index 107e676c47..107e676c47 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
index b85bd2722b..b85bd2722b 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
index 76b9f2856d..76b9f2856d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
index 6c1d291673..6c1d291673 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ContextBinder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ContextBinder.java
index 70b40e7269..70b40e7269 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ContextBinder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ContextBinder.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/LazyHTTPSessionId.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/LazyHTTPSessionId.java
index c9e69eaa82..c9e69eaa82 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/LazyHTTPSessionId.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/LazyHTTPSessionId.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ServletHost.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ServletHost.java
index 85a4a180c5..85a4a180c5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ServletHost.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ServletHost.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java
index 6637448204..6637448204 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
index 8c9c215d64..8c9c215d64 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/Interceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/Interceptor.java
index 1e87e45616..1e87e45616 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/Interceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/Interceptor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationConfiguration.java
index 94e8d91ba5..94e8d91ba5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationRuntimeException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationRuntimeException.java
index 5e3dbaa204..5e3dbaa204 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationRuntimeException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationRuntimeException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageChannel.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageChannel.java
index 07a7594849..07a7594849 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageChannel.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageChannel.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageHandler.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageHandler.java
index 19442f3663..19442f3663 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageHandler.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageHandler.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MethodHashMap.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MethodHashMap.java
index c0e40e0644..c0e40e0644 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MethodHashMap.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/MethodHashMap.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/ProxyCreationException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/ProxyCreationException.java
index 2caa613b8f..2caa613b8f 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/ProxyCreationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/ProxyCreationException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceInvocationConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceInvocationConfiguration.java
index 80e1450a0d..80e1450a0d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceInvocationConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceInvocationConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceWireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceWireFactory.java
index c460c71bd5..c460c71bd5 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceWireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceWireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvocationConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvocationConfiguration.java
index fc7810763d..fc7810763d 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvocationConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvocationConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
index 387da1bca3..387da1bca3 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetWireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetWireFactory.java
index f46754b975..f46754b975 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetWireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetWireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
index 78ab6ee3c7..78ab6ee3c7 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
index 0bada0bbfc..0bada0bbfc 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactory.java
index 55cab31adf..55cab31adf 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryFactory.java
index f055ecd427..f055ecd427 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryInitException.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryInitException.java
index caf535ee00..caf535ee00 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryInitException.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryInitException.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
index d9408b2fb0..d9408b2fb0 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
index ce6ebade0c..ce6ebade0c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java
index 9c114c013e..9c114c013e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java
index 8b9d484313..8b9d484313 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java
index ada01b7f91..ada01b7f91 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
index e46ed26184..e46ed26184 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java
index 4e3bb460aa..4e3bb460aa 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java
index ae1c69fc12..ae1c69fc12 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
index 2cef096a5e..2cef096a5e 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
index dbaab87fce..dbaab87fce 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
index 76f3b0389c..76f3b0389c 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java
index 3eaffb9ba8..3eaffb9ba8 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
index 3c61081caf..3c61081caf 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
diff --git a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
index eb41baf69a..eb41baf69a 100644
--- a/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
diff --git a/branches/java-M1/java/sca/core/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/sca/core/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/sca/core/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/sca/core/src/main/resources/META-INF/services/org.apache.tuscany.core.runtime.proxy.ServiceProxyFactory b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/services/org.apache.tuscany.core.runtime.proxy.ServiceProxyFactory
index 9b2d05d734..9b2d05d734 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/META-INF/services/org.apache.tuscany.core.runtime.proxy.ServiceProxyFactory
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/META-INF/services/org.apache.tuscany.core.runtime.proxy.ServiceProxyFactory
diff --git a/branches/java-M1/java/sca/core/src/main/resources/model/anyobject.xsd b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/model/anyobject.xsd
index 47f45d61d7..47f45d61d7 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/model/anyobject.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/model/anyobject.xsd
diff --git a/branches/java-M1/java/sca/core/src/main/resources/model/tuscany-system.xsd b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/model/tuscany-system.xsd
index 9c85db8c37..9c85db8c37 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/model/tuscany-system.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/model/tuscany-system.xsd
diff --git a/branches/java-M1/java/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties
index e3b2ff9a4f..e3b2ff9a4f 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties
diff --git a/branches/java-M1/java/sca/core/src/main/resources/system.module b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/system.module
index 8d76e19283..8d76e19283 100644
--- a/branches/java-M1/java/sca/core/src/main/resources/system.module
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/main/resources/system.module
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java
index 6f55182c2b..6f55182c2b 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java
index 4f17dc2a76..4f17dc2a76 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java
index e32de0eec1..e32de0eec1 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java
index 5b70848d06..5b70848d06 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTarget.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTarget.java
index 2147a3a4db..2147a3a4db 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTarget.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTarget.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTargetImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTargetImpl.java
index e6f76494f6..e6f76494f6 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTargetImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/SimpleTargetImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/DefaultWorkManagerTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/DefaultWorkManagerTestCase.java
index 964564f3ee..964564f3ee 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/DefaultWorkManagerTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/DefaultWorkManagerTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/GeronimoWorkManagerTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/GeronimoWorkManagerTestCase.java
index 18570d54c3..18570d54c3 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/GeronimoWorkManagerTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/async/work/GeronimoWorkManagerTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
index e4aaad62d1..e4aaad62d1 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
index 983dc577c4..983dc577c4 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean1.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean1.java
index c02961e5f4..c02961e5f4 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean1.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean1.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean2.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean2.java
index eaba545d8e..eaba545d8e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean2.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean2.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/JavaIntrospectionHelperTestCase.java
index 8a95a6c7b0..8a95a6c7b0 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/JavaIntrospectionHelperTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java
index 0a4e0cca0c..0a4e0cca0c 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/CoreAnnotationsProcessingTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/CoreAnnotationsProcessingTestCase.java
index aeb614e9c6..aeb614e9c6 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/CoreAnnotationsProcessingTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/CoreAnnotationsProcessingTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopeTestComponent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopeTestComponent.java
index 1ae24b6b74..1ae24b6b74 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopeTestComponent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopeTestComponent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopedParent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopedParent.java
index 0507af1a8a..0507af1a8a 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopedParent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/ScopedParent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFoo.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFoo.java
index e8a5079184..e8a5079184 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFoo.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFoo.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFooImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFooImpl.java
index 1d964cca8d..1d964cca8d 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFooImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperFooImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFoo.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFoo.java
index 893c2c5607..893c2c5607 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFoo.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFoo.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFooImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFooImpl.java
index 2025dd1cdd..2025dd1cdd 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFooImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/SuperSuperFooImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponent.java
index 8a462ff405..8a462ff405 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponentImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponentImpl.java
index 691bf18b3f..691bf18b3f 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestComponentImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponent.java
index 15b88547f7..15b88547f7 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponentImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponentImpl.java
index 86aca3b1bf..86aca3b1bf 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestLocalComponentImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestMultipleInterfacesComponentImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestMultipleInterfacesComponentImpl.java
index b395fd5442..b395fd5442 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestMultipleInterfacesComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestMultipleInterfacesComponentImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface.java
index 1a595573ae..1a595573ae 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface2.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface2.java
index 8aa6e6cb19..8aa6e6cb19 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface2.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterface2.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterfacesImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterfacesImpl.java
index 4f6f07b239..4f6f07b239 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterfacesImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceInterfacesImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceSpecifiedImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceSpecifiedImpl.java
index b8c0d6a7e8..b8c0d6a7e8 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceSpecifiedImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/TestNonServiceSpecifiedImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java
index f529595dae..f529595dae 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java
index b6e7f69daf..b6e7f69daf 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
index bd56a88658..bd56a88658 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java
index 4f86d1aed5..4f86d1aed5 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategyTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategyTestCase.java
index c9e6736833..c9e6736833 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategyTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategyTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ContextFactorySupportTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ContextFactorySupportTestCase.java
index 765d6efee4..765d6efee4 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ContextFactorySupportTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ContextFactorySupportTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/EntryPointBuilderSupportTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/EntryPointBuilderSupportTestCase.java
index 2f911fefa5..2f911fefa5 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/EntryPointBuilderSupportTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/EntryPointBuilderSupportTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupportTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupportTestCase.java
index a1c758c526..a1c758c526 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupportTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupportTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
index 0fd80c51af..0fd80c51af 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
index 44be759b69..44be759b69 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
index c17d96a145..c17d96a145 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/MockReaderSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/MockReaderSupport.java
index 542a4d7b2b..542a4d7b2b 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/MockReaderSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/MockReaderSupport.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java
index 177e4e5005..177e4e5005 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
index 0efe1ae82a..0efe1ae82a 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
index 37056b3283..37056b3283 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
index 43b5bec143..43b5bec143 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
index 8f207261fb..8f207261fb 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java
index 1fc5b367d5..1fc5b367d5 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderInterfaceStylesTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderInterfaceStylesTestCase.java
index 8b4f840f71..8b4f840f71 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderInterfaceStylesTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderInterfaceStylesTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java
index f97f13a1f7..f97f13a1f7 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
index 4e2aea5e83..4e2aea5e83 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
index c1ea3dbc1e..c1ea3dbc1e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WSDLDefinitionRegistryTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WSDLDefinitionRegistryTestCase.java
index 5543a41f91..5543a41f91 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WSDLDefinitionRegistryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WSDLDefinitionRegistryTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WireLoaderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WireLoaderTestCase.java
index 3a0331150d..3a0331150d 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WireLoaderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/WireLoaderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
index 820e4d36d8..820e4d36d8 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
index 87e92d783c..87e92d783c 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/AutowireSourceImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/AutowireSourceImpl.java
index fb1cb86873..fb1cb86873 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/AutowireSourceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/AutowireSourceImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/GenericSystemComponent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/GenericSystemComponent.java
index 1fd02de992..1fd02de992 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/GenericSystemComponent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/GenericSystemComponent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponent.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponent.java
index dabbd9e4ef..dabbd9e4ef 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponent.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponent.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponentImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponentImpl.java
index 58afde9354..58afde9354 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeSystemComponentImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java
index 6ce1059db1..6ce1059db1 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java
index 075e70699e..075e70699e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Target.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Target.java
index fb3642a495..fb3642a495 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Target.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Target.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java
index 323bee0713..323bee0713 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
index c4e1ea9962..c4e1ea9962 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
index d9596239fa..d9596239fa 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
index 45af495239..45af495239 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
index fe6bff635a..fe6bff635a 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
index 3398a010e9..3398a010e9 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
index f7543911a6..f7543911a6 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
index 3d63664848..3d63664848 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
index 6316fe3a67..6316fe3a67 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
index 27ffc5794e..27ffc5794e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
index a956263cc8..a956263cc8 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
index 75208f47b6..75208f47b6 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
index 4397e39bec..4397e39bec 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
index ba7a3ba5da..ba7a3ba5da 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
index 241346e24f..241346e24f 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
index c531c8f7f9..c531c8f7f9 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
index 5e4b3e2f9e..5e4b3e2f9e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
index 0519573439..0519573439 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
index 1d04e18757..1d04e18757 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
index 28a2da23b5..28a2da23b5 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
index 60f8cf837d..60f8cf837d 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java
index 9def6b5b0e..9def6b5b0e 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java
index 915885549a..915885549a 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java
index 66e8579cb4..66e8579cb4 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java
index a64caed8eb..a64caed8eb 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java
index 8e8af9ec18..8e8af9ec18 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java
index 900fa9c324..900fa9c324 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java
index d63d3a0565..d63d3a0565 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java
diff --git a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java
index 1b6fe93ac8..1b6fe93ac8 100644
--- a/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java
diff --git a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/config/ModuleComponentLoaderTest1.module b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/config/ModuleComponentLoaderTest1.module
index b261cbe6c0..b261cbe6c0 100644
--- a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/config/ModuleComponentLoaderTest1.module
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/config/ModuleComponentLoaderTest1.module
diff --git a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.wsdl b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.wsdl
index 3a23e7b717..3a23e7b717 100644
--- a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.wsdl
diff --git a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.xsd b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.xsd
index e34b6e92e0..e34b6e92e0 100644
--- a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/example.xsd
diff --git a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/interfacestyles.wsdl b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/interfacestyles.wsdl
index eeab33193d..eeab33193d 100644
--- a/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/interfacestyles.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/assembly/interfacestyles.wsdl
diff --git a/branches/java-M1/java/sca/core/src/test/resources/system.fragment b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/system.fragment
index 74d04561cd..74d04561cd 100644
--- a/branches/java-M1/java/sca/core/src/test/resources/system.fragment
+++ b/sca-java-1.x/branches/java-M1/java/sca/core/src/test/resources/system.fragment