199 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/META-INF/MANIFEST.MF
index b109725d55..b109725d55 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/pom.xml
index 572458d8fb..572458d8fb 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index dc7be4dcb4..dc7be4dcb4 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index c915f389ea..c915f389ea 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
index 7f2e3fa23d..7f2e3fa23d 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 427e0b254a..427e0b254a 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 4267b1e347..4267b1e347 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
index 97e16da273..97e16da273 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
index 97629ea7b5..97629ea7b5 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index 82853599b5..82853599b5 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 6e2e714bdb..6e2e714bdb 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index b05f0cc238..b05f0cc238 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index d5ba528475..d5ba528475 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 9633262116..9633262116 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index 90b6f24872..90b6f24872 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 679897b59b..679897b59b 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index a4466bfd1a..a4466bfd1a 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-2.0-M3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index 1905cfb217..1905cfb217 100644
--- a/branches/sca-java-2.0-M3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/META-INF/MANIFEST.MF
index 170bc6314d..170bc6314d 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/pom.xml
index d7c81d83f4..d7c81d83f4 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/doc/Context Model.emx b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 134f49e7b0..134f49e7b0 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 3c4be9cd55..3c4be9cd55 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index d8f15b411c..d8f15b411c 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 75719bb0cc..75719bb0cc 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index c9ee00ff85..c9ee00ff85 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index af8ad6e582..af8ad6e582 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
index b68a485e55..b68a485e55 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 84e000ab10..84e000ab10 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
index 7871aea07c..7871aea07c 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
index 11464125ad..11464125ad 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
index 61cfbe8536..61cfbe8536 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
index f385c7dfba..f385c7dfba 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
index 183b38cb33..183b38cb33 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index d9ac4d16b0..d9ac4d16b0 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
index 23a48c8e36..23a48c8e36 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
index 3ea9d0ac3c..3ea9d0ac3c 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
index 278bb23e0a..278bb23e0a 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
index a7bca9afba..a7bca9afba 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
index fd748df6ca..fd748df6ca 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
index 4fa0fbd85f..4fa0fbd85f 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
index f449fefa9c..f449fefa9c 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index db78eae395..db78eae395 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index d87ba4e1b6..d87ba4e1b6 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 0105abd6e4..0105abd6e4 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index 0d9e4d1c86..0d9e4d1c86 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index b1beac78e2..b1beac78e2 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index ddd91bceac..ddd91bceac 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index 91839e998f..91839e998f 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
index b7501e854e..b7501e854e 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 6486a5ed4f..6486a5ed4f 100644
--- a/branches/sca-java-2.0-M3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/core/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/META-INF/MANIFEST.MF
index a20fa4093a..a20fa4093a 100644
--- a/branches/sca-java-2.0-M3/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/core/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/core/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/core/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/pom.xml
index 8c4e85ebdb..8c4e85ebdb 100644
--- a/branches/sca-java-2.0-M3/modules/core/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 939afa40a8..939afa40a8 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
index 4617901c5b..4617901c5b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 8c84a9e399..8c84a9e399 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 27fad24b1f..27fad24b1f 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index b9eb6c117b..b9eb6c117b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
index 2c833a885e..2c833a885e 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index b2b8c86919..b2b8c86919 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
index 6032005b9a..6032005b9a 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index c0a9f616f6..c0a9f616f6 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
index 776d35327d..776d35327d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index f2ec7f8019..f2ec7f8019 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index 36f49eac5e..36f49eac5e 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index ada355d32e..ada355d32e 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
index 6762896652..6762896652 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
index 6db3af213d..6db3af213d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
index 5d26670f3b..5d26670f3b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index 4e43518738..4e43518738 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
index ace4dc48e1..ace4dc48e1 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
index aa1e1de0f6..aa1e1de0f6 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
index af42b4a76a..af42b4a76a 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index 1b248f65c7..1b248f65c7 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
index 2fe223c523..2fe223c523 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index 9daf430ad5..9daf430ad5 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 086c32ee24..086c32ee24 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
index 9182b080fe..9182b080fe 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index 425fa3af9c..425fa3af9c 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index ed858bd499..ed858bd499 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
index e23659b990..e23659b990 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
index 34bf8a12d5..34bf8a12d5 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
index 2371897dce..2371897dce 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
index 8c8f001eb9..8c8f001eb9 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 8b0b55f77f..8b0b55f77f 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index e6bee6b8d9..e6bee6b8d9 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b949500ab9..b949500ab9 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 4c3bee0dc9..4c3bee0dc9 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index bb212d5869..bb212d5869 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index 0be6e31b43..0be6e31b43 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 747a5ba032..747a5ba032 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index a5fabdf0f6..a5fabdf0f6 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index f785cb8f37..f785cb8f37 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index f81e17c49b..f81e17c49b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 2fc3d6c7eb..2fc3d6c7eb 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
index c349e43615..c349e43615 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
index 3c7fefb674..3c7fefb674 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index b0e108dd93..b0e108dd93 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 49b9d87096..49b9d87096 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index dc713353fe..dc713353fe 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
index 6ce2ffca21..6ce2ffca21 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index d24da46b3f..d24da46b3f 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
index 45f4bf52bf..45f4bf52bf 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
index c9024fecef..c9024fecef 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
index 175f3463ad..175f3463ad 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 4674456925..4674456925 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
index b6857be97a..b6857be97a 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 2398ecea3e..2398ecea3e 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 30d5c77181..30d5c77181 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
index 6763c8117d..6763c8117d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
index f61e70a598..f61e70a598 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
index 8dfe77f61b..8dfe77f61b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
index f8ffc027a1..f8ffc027a1 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
index bfe197255d..bfe197255d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
index d6aaa4cc84..d6aaa4cc84 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
index 7519af2341..7519af2341 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
index 9d1cf88d96..9d1cf88d96 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
index f11295c9fa..f11295c9fa 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
index 0639b8885b..0639b8885b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
index 5bf20a6a5f..5bf20a6a5f 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index 3df2f7188b..3df2f7188b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index 12fa4a485d..12fa4a485d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
index ca06d0e854..ca06d0e854 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
index 4580011806..4580011806 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
index 0fc104d0fc..0fc104d0fc 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
index facb2dfe56..facb2dfe56 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
index e118d5967b..e118d5967b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
index 171588cc7b..171588cc7b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 97a1d70d49..97a1d70d49 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
index d5e13292d2..d5e13292d2 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.EndpointSerializer b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.EndpointSerializer
index cc3306b325..cc3306b325 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.EndpointSerializer
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.EndpointSerializer
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
index 67cec934b4..67cec934b4 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index af281d8f4d..af281d8f4d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
index a4a0154987..a4a0154987 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index 00a33e1656..00a33e1656 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 9923ba5927..9923ba5927 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
index b11eaa9621..b11eaa9621 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
index d6367163fa..d6367163fa 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
index b8150d4edc..b8150d4edc 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
index 8fcead004d..8fcead004d 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
index c268e133e4..c268e133e4 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
index 16ca5fd00e..16ca5fd00e 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
index 2d791e5012..2d791e5012 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
index c0183b6f9b..c0183b6f9b 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
index 307f24aca7..307f24aca7 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
index 904f4ca5e0..904f4ca5e0 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
index a452d6f371..a452d6f371 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
index b66fa75828..b66fa75828 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
index f6435659ef..f6435659ef 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index ca7bf9b3d7..ca7bf9b3d7 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index ad23df3761..ad23df3761 100644
--- a/branches/sca-java-2.0-M3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest