229 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/META-INF/MANIFEST.MF
index a05843081e..a05843081e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/pom.xml
index a2d8c7898f..a2d8c7898f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index 0ab01fbe0b..0ab01fbe0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
index e72c1b7999..e72c1b7999 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 4997a872ba..4997a872ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
index dcd3c3fda3..dcd3c3fda3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index f0e4a0fa10..f0e4a0fa10 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index 1386aa38e9..1386aa38e9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
index 5be7ba1da4..5be7ba1da4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 706e01aac7..706e01aac7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index bdb4d6fa08..bdb4d6fa08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 8b15d616ac..8b15d616ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 44e5072e61..44e5072e61 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f5d37ff3..a1f5d37ff3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index 875814fccc..875814fccc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
index dfd86a3a53..dfd86a3a53 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/pom.xml
index 8af48ea984..8af48ea984 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/LICENSE
index 69a1a5eee6..69a1a5eee6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/NOTICE
index 85c82bd9ce..85c82bd9ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/README.txt b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/README.txt
index d8be6ae636..d8be6ae636 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-runtime-pom/src/main/resources/README.txt
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-runtime-pom/src/main/resources/README.txt
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/META-INF/MANIFEST.MF
index baae06d53a..baae06d53a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/pom.xml
index 2fa66ee242..2fa66ee242 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/doc/Context Model.emx b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/doc/Context Model.emx
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 2a690dbf0d..2a690dbf0d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
index 313c4bb64e..313c4bb64e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index ddcc46a1ac..ddcc46a1ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 50882c9498..50882c9498 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 5b91db124c..5b91db124c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 4475427d4b..4475427d4b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
index d6237b7ce3..d6237b7ce3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index 42954555b1..42954555b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
index f29dfddf6a..f29dfddf6a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index b7e26d68eb..b7e26d68eb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 69309f6dd0..69309f6dd0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
index 025010a076..025010a076 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
index 7eeabb760e..7eeabb760e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 2bafdb64b8..2bafdb64b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 711c09728b..711c09728b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 4f81b763c7..4f81b763c7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
index f77a662779..f77a662779 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
index 7d20ec7fc0..7d20ec7fc0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BaseBindingImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BaseBindingImpl.java
index 3d47bd22f0..3d47bd22f0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BaseBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BaseBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
index ab1b33ac3c..ab1b33ac3c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
index 5f2e6bd315..5f2e6bd315 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 36e34c11b7..36e34c11b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 40b6275667..40b6275667 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointAsyncProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointAsyncProvider.java
index b74b1dd9a7..b74b1dd9a7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointAsyncProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointAsyncProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
index a25814234a..a25814234a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceAsyncProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceAsyncProvider.java
index 044ba523b9..044ba523b9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceAsyncProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceAsyncProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
index 209b057859..209b057859 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationAsyncProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationAsyncProvider.java
index 2941483ede..2941483ede 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationAsyncProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationAsyncProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 4e9fddb135..4e9fddb135 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index cfb06d9c70..cfb06d9c70 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
index c0346780d8..c0346780d8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
index 43ea8d171b..43ea8d171b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OptimisingBindingProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OptimisingBindingProvider.java
index 57c9b48349..57c9b48349 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OptimisingBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OptimisingBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index de0b62eecd..de0b62eecd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index 134df1c37e..134df1c37e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 75c5544aa3..75c5544aa3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index ab864dba3f..ab864dba3f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
index 2afd44af31..2afd44af31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCABindingMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCABindingMapper.java
index 706bf7d319..706bf7d319 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCABindingMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCABindingMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e7df45bfa8..e7df45bfa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
index 674b708ef8..674b708ef8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
index 3f629ddeef..3f629ddeef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
index b015891e93..b015891e93 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActiveNodes.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActiveNodes.java
index c3b6527181..c3b6527181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActiveNodes.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActiveNodes.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
index 3d9d2cb14c..3d9d2cb14c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
index ce38eb4eee..ce38eb4eee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
index d9bdc2b6f6..d9bdc2b6f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
index 6ddffb06da..6ddffb06da 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionListener.java
index d1eba27a79..d1eba27a79 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
index f74d80b882..f74d80b882 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 283d1d1a8b..283d1d1a8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
index c33d3c1a4b..c33d3c1a4b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
index 69ed07763e..69ed07763e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
index f1582c3d70..f1582c3d70 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
index 6de0878383..6de0878383 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
index 13d193c464..13d193c464 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
index 79e8dfc475..79e8dfc475 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
index 981872fdfa..981872fdfa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
index ddb4279a4e..ddb4279a4e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
index 78a87191de..78a87191de 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 928c77fd04..928c77fd04 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 01b0111e59..01b0111e59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index cf2042a0ae..cf2042a0ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 5dc114ade0..5dc114ade0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 1eefdc978e..1eefdc978e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
index b45def3e95..b45def3e95 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
index dbdd458543..dbdd458543 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
index 0e02d2cd94..0e02d2cd94 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index 997e170b22..997e170b22 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/UnknownEndpointHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/UnknownEndpointHandler.java
index cfb205f489..cfb205f489 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/UnknownEndpointHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/UnknownEndpointHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
index 5d3ed1ce41..5d3ed1ce41 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index f8a1ef4d23..f8a1ef4d23 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index 454d1796cc..454d1796cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index 19cf2a444f..19cf2a444f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
index be585a1e03..be585a1e03 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 1ab308cc71..1ab308cc71 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
index 9018bd1a1b..9018bd1a1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 6486a5ed4f..6486a5ed4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
index b7e96a8b28..b7e96a8b28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
index 89ca99484c..89ca99484c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/core/META-INF/MANIFEST.MF
index 0a8fabf708..0a8fabf708 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/core/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/core/pom.xml
index c0053bfb98..c0053bfb98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 790cc6ec98..790cc6ec98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 49c72aa267..49c72aa267 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
index c8383d3065..c8383d3065 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index 4e5275058e..4e5275058e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
index 002eb774ef..002eb774ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
index 4d6a98ca5f..4d6a98ca5f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index 7bd56271a5..7bd56271a5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
index a71c823c11..a71c823c11 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index 2eea60ccea..2eea60ccea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
index bc7e6df878..bc7e6df878 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index ad5cc139e2..ad5cc139e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index fe5b47256d..fe5b47256d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/WSDLHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/WSDLHelper.java
index 18dd21220b..18dd21220b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/WSDLHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/WSDLHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index d2528784fd..d2528784fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
index ace4dc48e1..ace4dc48e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
index 5206f0945e..5206f0945e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
index 6f5b0be0e7..6f5b0be0e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index db12ed14d9..db12ed14d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index 5d0527682e..5d0527682e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 0cda879011..0cda879011 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
index 4b563b0079..4b563b0079 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index 820faf6259..820faf6259 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index db10b6cff2..db10b6cff2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncFaultWrapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncFaultWrapper.java
index 3d98de9e21..3d98de9e21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncFaultWrapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncFaultWrapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseException.java
index df90c3286d..df90c3286d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseHandler.java
index 306a141433..306a141433 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
index 1ebc9c633a..1ebc9c633a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseService.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseService.java
index 62d7f74505..62d7f74505 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 400bb333fd..400bb333fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 588eaa2d15..588eaa2d15 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index a56983a5d3..a56983a5d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index fff3727d87..fff3727d87 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index cb2c01f7d6..cb2c01f7d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/Constants.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/Constants.java
index d6f872d00a..d6f872d00a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/Constants.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/Constants.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 03505da302..03505da302 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index 049c73f258..049c73f258 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 08019ec3e2..08019ec3e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InterceptorAsyncImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InterceptorAsyncImpl.java
index 265311fe6b..265311fe6b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InterceptorAsyncImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InterceptorAsyncImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKAsyncResponseInvoker.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKAsyncResponseInvoker.java
index ad797b68b0..ad797b68b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKAsyncResponseInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKAsyncResponseInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 7108728206..7108728206 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index f2d272757d..f2d272757d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 3e0bd7cb17..3e0bd7cb17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
index a9b93ae2e8..a9b93ae2e8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 489d06a3e1..489d06a3e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncInvocationFutureImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncInvocationFutureImpl.java
index 213fd536e9..213fd536e9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncInvocationFutureImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncInvocationFutureImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
index 29d2da1487..29d2da1487 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
index 7b459f3e7d..7b459f3e7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponseHandlerImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponseHandlerImpl.java
index 9de1809200..9de1809200 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponseHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponseHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
index 0e4d4344d2..0e4d4344d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index c35b70ad74..c35b70ad74 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 41f469cc1b..41f469cc1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index 7109dad1fd..7109dad1fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
index 6f3e947631..6f3e947631 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index cc8cb48cc5..cc8cb48cc5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
index 45f4bf52bf..45f4bf52bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
index 85ef79b5d7..85ef79b5d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
index 175f3463ad..175f3463ad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
index 99d9cb464f..99d9cb464f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
index cd8bc936af..cd8bc936af 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index a1bb91faec..a1bb91faec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
index 2ea724ccf6..2ea724ccf6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 35da433af0..35da433af0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 7d34a0144b..7d34a0144b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index ee55917f2f..ee55917f2f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index 98c5f84c71..98c5f84c71 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 5c85fead2c..5c85fead2c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 89ddd7e538..89ddd7e538 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index 17afd36219..17afd36219 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
index efe7c94b54..efe7c94b54 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
index f61e70a598..f61e70a598 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
index 9884c5f053..9884c5f053 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
index 1235fd2a67..1235fd2a67 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
index 5bf20a6a5f..5bf20a6a5f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index dd4abf0cd2..dd4abf0cd2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index 7e116655e1..7e116655e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
index ca06d0e854..ca06d0e854 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
index 4580011806..4580011806 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
index 0fc104d0fc..0fc104d0fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
index 38bbaeebe0..38bbaeebe0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index e8ee318b6c..e8ee318b6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
index 51ed2449fb..51ed2449fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
index 70b17a2f00..70b17a2f00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 94c83ceeab..94c83ceeab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index c6567aa904..c6567aa904 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
index 2aa000efc0..2aa000efc0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index a21b75b570..a21b75b570 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
index 0182f52086..0182f52086 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index 6a01eac2df..6a01eac2df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
index 61edf5111e..61edf5111e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
index fb951e75d5..fb951e75d5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
index 66e0277d59..66e0277d59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 90e887739a..90e887739a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/core-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/core-messages.properties
index f6346b885f..f6346b885f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/core-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/core-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/endpoint-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/endpoint-validation-messages.properties
index 75f635fb1a..75f635fb1a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/main/resources/endpoint-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/main/resources/endpoint-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
index 38306317b4..38306317b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
index 8fcead004d..8fcead004d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
index c268e133e4..c268e133e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
index 16ca5fd00e..16ca5fd00e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
index 2d791e5012..2d791e5012 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
index c0183b6f9b..c0183b6f9b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
index 307f24aca7..307f24aca7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
index 4ec0f55867..4ec0f55867 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
index a452d6f371..a452d6f371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
index 122609d7e6..122609d7e6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
index f6435659ef..f6435659ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index ca7bf9b3d7..ca7bf9b3d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index ad23df3761..ad23df3761 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest